diff --git a/Main/SOGo.m b/Main/SOGo.m
index 9880a55a0..5f3e02e49 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -274,13 +274,13 @@ static BOOL debugLeaks;
 
   if ([GCSFolderManager singleStoreMode])
     {
-      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", @"OCSStoreURL", @"OCSAclURL", @"OCSCacheFolderURL", @"OCSAdminURL", nil];
+      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", @"OCSStoreURL", @"OCSAclURL", @"OCSCacheFolderURL", nil];
       quickTypeStrings = [NSArray arrayWithObjects: @"contact", @"appointment", nil];
       combined = YES;
     }
   else
     {
-      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", nil];
+      urlStrings = [NSArray arrayWithObjects: @"SOGoProfileURL", @"OCSFolderInfoURL", @"OCSAdminURL", nil];
       combined = NO;
     }
 
diff --git a/SOPE/GDLContentStore/GCSAdminFolder.h b/SOPE/GDLContentStore/GCSAdminFolder.h
index 3dc346ebe..bc03406af 100644
--- a/SOPE/GDLContentStore/GCSAdminFolder.h
+++ b/SOPE/GDLContentStore/GCSAdminFolder.h
@@ -34,7 +34,7 @@
   GCSFolderManager *folderManager;
 }
 
-+ (id) alarmsFolderWithFolderManager: (GCSFolderManager *) newFolderManager;
++ (id)adminFolderWithFolderManager:(GCSFolderManager *)newFolderManager;
 
 - (void) setFolderManager: (GCSFolderManager *) newFolderManager;
 
diff --git a/SOPE/GDLContentStore/GCSAdminFolder.m b/SOPE/GDLContentStore/GCSAdminFolder.m
index 84d4587ca..219d63546 100644
--- a/SOPE/GDLContentStore/GCSAdminFolder.m
+++ b/SOPE/GDLContentStore/GCSAdminFolder.m
@@ -53,7 +53,7 @@ static NSString *adminFolderURLString = nil;
     }
 }
 
-+ (id) alarmsFolderWithFolderManager: (GCSFolderManager *) newFolderManager
++ (id) adminFolderWithFolderManager: (GCSFolderManager *) newFolderManager
 {
   GCSAlarmsFolder *newFolder;
 
diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m
index 42a6dc8ce..dc48aa2c8 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/GDLContentStore/GCSFolderManager.m
@@ -501,7 +501,7 @@ static BOOL       _singleStoreMode           = NO;
 /* admin */
 - (GCSAdminFolder *) adminFolder
 {
-  return [GCSAdminFolder alarmsFolderWithFolderManager: self];
+  return [GCSAdminFolder adminFolderWithFolderManager: self];
 }
 
 - (NSString *)generateSQLWhereForInternalNames:(NSArray *)_names
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 46a5c90c8..0aea5dd48 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -303,7 +303,6 @@
 "Last" = "Last used";
 "Default Module " = "Default Module";
 "SOGo Version" = "SOGo Version";
-"Administration" = "Administration";
 
 /* Confirmation asked when changing the language */
 "Save preferences and reload page now?" = "Save preferences and reload page now?";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 4f42bf44f..e39bebfb4 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -303,7 +303,6 @@
 "Last" = "Dernier utilisé";
 "Default Module " = "Module par défaut";
 "SOGo Version" = "Version";
-"Administration" = "Administration";
 
 /* Confirmation asked when changing the language */
 "Save preferences and reload page now?" = "Sauvegarder les préférences et recharger maintenant?";