diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 1d478f652..473cf78c2 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -2086,6 +2086,10 @@ static NSArray *reminderValues = nil;
       // We convert our object into a mutable one
       v = [[v mutableCopy] autorelease];
 
+      if ([[v objectForKey: @"SOGoLoginModule"] isEqualToString: @"Last"])
+        [v setObject: [NSNumber numberWithBool: YES]  forKey: @"SOGoRememberLastModule"];
+      else
+        [v setObject: [NSNumber numberWithBool: NO]  forKey: @"SOGoRememberLastModule"];
 
       // We remove short/long date formats if they are default ones
       if ([[v objectForKey: @"SOGoShortDateFormat"] isEqualToString: @"default"])