diff --git a/ChangeLog b/ChangeLog
index eaae1e86c..5304724d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-08-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MainUI/SOGoUserHomePage.m (-defaultAction): when the user has
+	never logged in or switched module, the SOGoUIxLastModule
+	preference would never be set, causing a crash when the moduleURL
+	was created, because of a nil parameter. Also, the "defaultModule"
+	global variable was set to the userDefinedModule, which is
+	simply wrong as the global variable impacts all the users and need
+	to be kept intact.
+
 	* SoObjects/Appointments/SOGoAptMailReceipt.[hm]: new module
 	containing the template code for sending event receipts.
 
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 8eeee8fe3..d81ba178c 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -98,12 +98,12 @@ static NSString *LDAPContactInfoAttribute = nil;
     {
       if ([userDefinedModule isEqualToString: @"Last"])
         userDefinedModule = [ud stringForKey: @"SOGoUIxLastModule"];
-
-      defaultModule = userDefinedModule;
     }
+  if (!userDefinedModule)
+    userDefinedModule = defaultModule;
 
   co = [self clientObject];
-  moduleURL = [NSURL URLWithString: defaultModule
+  moduleURL = [NSURL URLWithString: userDefinedModule
 		     relativeToURL: [co soURL]];
 
   return [self redirectToLocation: [moduleURL absoluteString]];