1 files changed, 9 insertions, 10 deletions
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 2fc177476..fbae0813f 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -153,21 +153,20 @@ void LoginHandler::loginOrRegister(LoginData *const data) const
 
     const bool remember = data->remember;
     if (remember)
-    {
         serverConfig.setValue("username", data->username);
-#ifdef SAVE_PASSWORD
-        serverConfig.setValue("password", data->password);
-#endif
-    }
     else
-    {
         serverConfig.setValue("username", "");
-#ifdef SAVE_PASSWORD
-        serverConfig.setValue("password", "");
-#endif
-    }
+
     serverConfig.setValue("remember", remember);
 
+    const bool remember_password = data->remember_password;
+    if (remember_password)
+        serverConfig.setValue("password", data->password);
+    else
+        serverConfig.setValue("password", "");
+
+    serverConfig.setValue("remember_password", remember_password);
+
     // Clear the password, avoids auto login when returning to login
     data->password.clear();
 }