Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -381,6 +381,7 @@
 server = "lobby.wildfiregames.com"  ; Address of lobby server
 xpartamupp = "wfgbot23"             ; Name of the server-side xmpp client that manage games
 buddies = ","                       ; Comma separated list of playernames that the current user has marked as buddies
+rememberpassword = false            ; Store the encoded lobby password
 
 [lobby.columns]
 gamerating = false                  ; Show the average rating of the participating players in a column of the gamelist
Index: binaries/data/mods/public/gui/lobby/prelobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/prelobby.js
+++ binaries/data/mods/public/gui/lobby/prelobby.js
@@ -190,7 +190,13 @@
 			if (password != g_EncryptedPassword.substring(0, 10))
 				g_EncryptedPassword = Engine.EncryptPassword(password, username);
 			Engine.ConfigDB_CreateValue("user", "lobby.password", g_EncryptedPassword);
-			Engine.ConfigDB_WriteValueToFile("user", "lobby.password", g_EncryptedPassword, "config/user.cfg");
+			if (Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") != "true")
+			{
+				Engine.ConfigDB_RemoveValue("user", "lobby.password");
+				Engine.ConfigDB_WriteFile("user", "config/user.cfg");
+			}
+			else
+				Engine.ConfigDB_WriteValueToFile("user", "lobby.password", g_EncryptedPassword, "config/user.cfg");
 			break;
 		}
 		}
Index: binaries/data/mods/public/gui/lobby/prelobby.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/prelobby.xml
+++ binaries/data/mods/public/gui/lobby/prelobby.xml
@@ -52,6 +52,19 @@
 					lobbyStartConnect();
 				</action>
 			</object>
+			<object name="rememberPassword" type="checkbox" size="50%-19 115 50% 135" style="ModernTickBox">
+				<action on="Load">
+					this.checked = Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true";
+				</action>
+				<action on="Press">
+					let enabled = Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") != "true";
+					Engine.ConfigDB_CreateValue("user", "lobby.rememberpassword", String(enabled));
+					Engine.ConfigDB_WriteValueToFile("user", "lobby.rememberpassword", String(enabled), "config/user.cfg");
+				</action>
+			</object>
+			<object type="text" size="50%+10 115 100%-20 135" style="ModernLeftLabelText">
+				<translatableAttribute id="caption">Remember password</translatableAttribute>
+			</object>
 		</object>
 		<object name="pageRegister" size="0 32 100% 100%" hidden="true">