diff --git a/ChangeLog b/ChangeLog
index afbaff01e..79e2151a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,9 @@
 2008-09-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
-	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
-	+initialize]): use the user default "SOGoFallbackIMAP4Server" to
-	override the value of "serverName" from the actual user settings.
-	Fallback to "localhost" if value is unset.
-
-	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
-	-imap4URLString]): use the value of SOGoFallbackIMAP4Server, as
-	mentionne above.
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser
+	-initWithLogin:newLoginroles:newRoles]): moved the core from init
+	here.
+	([-init]): removed method.
 
 2008-08-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 3a5d7dfb3..de657f149 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -201,7 +201,7 @@ _timeValue (NSString *key)
       if (user)
 	{
 	  [user autorelease];
-	  [cache registerUser: user];
+ 	  [cache registerUser: user];
 	}
     }
   [user setPrimaryRoles: newRoles];
@@ -209,25 +209,6 @@ _timeValue (NSString *key)
   return user;
 }
 
-- (id) init
-{
-  if ((self = [super init]))
-    {
-      userDefaults = nil;
-      userSettings = nil;
-      allEmails = nil;
-      language = nil;
-      currentPassword = nil;
-      dateFormatter = nil;
-      homeFolder = nil;
-      cn = nil;
-      userTimeZone = nil;
-      mailAccounts = nil;
-    }
-
-  return self;
-}
-
 - (id) initWithLogin: (NSString *) newLogin
 	       roles: (NSArray *) newRoles
 {
@@ -247,7 +228,21 @@ _timeValue (NSString *key)
     }
 
   if ([realUID length])
-    self = [super initWithLogin: realUID roles: newRoles];
+    {
+      if ((self = [super initWithLogin: realUID roles: newRoles]))
+	{
+	  userDefaults = nil;
+	  userSettings = nil;
+	  allEmails = nil;
+	  language = nil;
+	  currentPassword = nil;
+	  dateFormatter = nil;
+	  homeFolder = nil;
+	  cn = nil;
+	  userTimeZone = nil;
+	  mailAccounts = nil;
+	}
+    }
   else
     {
       [self release];