diff --git a/ChangeLog b/ChangeLog
index d47cf7cb0..e99f7f173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser +initialize]): retain
+	"superUsernames" after fetching it from the ud.
+
 2007-10-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index f3a0633ac..708ed4f96 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -98,9 +98,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 	ASSIGN (defaultLanguage, @"English");
     }
   if (!superUsernames)
-    {
-      superUsernames = [ud arrayForKey: @"SOGoSuperUsernames"];
-    }
+    ASSIGN (superUsernames, [ud arrayForKey: @"SOGoSuperUsernames"]);
 
   acceptAnyUser = ([[ud stringForKey: @"SOGoAuthentificationMethod"]
 		     isEqualToString: @"bypass"]);