diff --git a/NEWS b/NEWS
index c39f53842..300e4a79d 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ Bug fixes
  - [web] fixed time format when user chooses the default one
  - [web] added missing delegators identities in mail editor (#3720)
  - [web] honor the domain default SOGoAppointmentSendEMailNotifications (#3729)
+ - [web] the login module parameter is now properly restored when set as "Last used"
 
 3.1.2 (2016-06-06)
 ------------------
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index a39fc45ab..05f7d99e0 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -283,7 +283,7 @@ static SoProduct *preferencesProduct = nil;
   if (![[defaults source] objectForKey: @"SOGoMailDisplayRemoteInlineImages"])
     [[defaults source] setObject: [defaults mailDisplayRemoteInlineImages] forKey: @"SOGoMailDisplayRemoteInlineImages"];
 
-  // Populate default mail lablels, based on the user's preferred language
+  // Populate default mail labels, based on the user's preferred language
   if (![[defaults source] objectForKey: @"SOGoMailLabelsColors"])
     {
       SOGoMailLabel *label;
@@ -356,6 +356,10 @@ static SoProduct *preferencesProduct = nil;
       [values setObject: vacation forKey: @"Vacation"];
     }
 
+  // Don't expose SOGoRememberLastModule;
+  // User can edit SOGoLoginModule but SOGoRememberLastModule is managed internally.
+  [values removeObjectForKey: @"SOGoRememberLastModule"];
+
   return [self responseWithStatus: 200 andJSONRepresentation: values];
 }