diff --git a/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.js b/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.js
new file mode 100644
index 0000000000..b24d7dba41
--- /dev/null
+++ b/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.js
@@ -0,0 +1,107 @@
+/**
+ * The account settings page allows the player to change some of their account settings.
+ */
+var AccountSettingsPage = {
+ async openPage(xmppMessages)
+ {
+ const pageElement = Engine.GetGUIObjectByName("accountSettingsPage");
+ const requestResult = Engine.GetGUIObjectByName("as_RequestResult");
+
+ try
+ {
+ pageElement.hidden = false;
+ pageElement.onTick = updateTimers;
+ await Promise.race([
+ new Promise(resolve => {
+ Engine.SetGlobalHotkey("cancel", "Press", resolve);
+ Engine.GetGUIObjectByName("as_Close").onPress = resolve;
+ }),
+ AccountSettingsPage._changePasswordLoop(requestResult, xmppMessages)
+ ]);
+ }
+ finally
+ {
+ requestResult.caption = "";
+ pageElement.hidden = true;
+ }
+ },
+
+ async _changePasswordLoop(...args)
+ {
+ const changePasswordButton = Engine.GetGUIObjectByName("as_ChangePasswordBtn")
+ while (true)
+ {
+ await new Promise(resolve => {
+ changePasswordButton.onPress = resolve;
+ });
+ try
+ {
+ changePasswordButton.enabled = false;
+ await AccountSettingsPage._changePassword(...args);
+ }
+ finally
+ {
+ changePasswordButton.enabled = true;
+ }
+ }
+ },
+
+ async _changePassword(requestResult, xmppMessages)
+ {
+ const SetPasswordError = class extends Error{};
+ let timeout;
+ try
+ {
+ requestResult.caption = "Changing password…";
+ const encryptedPassword = AccountSettingsPage._readAndValidatePassword(SetPasswordError);
+ Engine.LobbyChangePassword(encryptedPassword);
+ await new Promise((resolve, reject) => {
+ xmppMessages.registerXmppMessageHandler("system", "registered", resolve);
+ xmppMessages.registerXmppMessageHandler("system", "error", message => {
+ reject(new SetPasswordError(message.text));
+ });
+ timeout = setTimeout(reject.bind(null,
+ new SetPasswordError(translate("Request timed out."))), 30000);
+ });
+ requestResult.caption = translate("Password changed successfully.");
+ const rememberPassword = Engine.ConfigDB_GetValue("user", "lobby.rememberpassword");
+ const functionSufix = rememberPassword === "true" ? "CreateValue" : "RemoveValue";
+ Engine["ConfigDB_" + functionSufix]("user", "lobby.password", encryptedPassword);
+ Engine.ConfigDB_SaveChanges("user");
+ }
+ catch (e)
+ {
+ if (e instanceof SetPasswordError)
+ requestResult.caption = e.message;
+ else
+ {
+ requestResult.caption = "";
+ error(uneval(e));
+ }
+ }
+ finally
+ {
+ clearTimeout(timeout);
+ }
+ },
+
+ _readAndValidatePassword(SetPasswordError)
+ {
+ const newPass = Engine.GetGUIObjectByName("as_PasswordInput").caption;
+ if (newPass.length < minimumPasswordLength)
+ throw new SetPasswordError(translate("Please choose a longer password"));
+
+ if (Engine.GetGUIObjectByName("as_PasswordInputConfirm").caption !== newPass)
+ throw new SetPasswordError(translate("Passwords do not match"));
+
+ let usn = Engine.LobbyGetJID();
+ let atIndex = usn.indexOf("@");
+ if (atIndex == -1)
+ {
+ // Probably can't happen too easily, so error out.
+ error("Invalid JID");
+ throw new SetPasswordError(translate("Invalid JID, cannot change password."));
+ }
+ return Engine.EncryptPassword(newPass, usn.substring(0, atIndex).toLowerCase());
+ }
+};
diff --git a/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.xml b/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.xml
new file mode 100644
index 0000000000..ef44f8b30e
--- /dev/null
+++ b/binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.xml
@@ -0,0 +1,36 @@
+
+
diff --git a/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js b/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
index 8b9887c853..75da3b84f5 100644
--- a/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
+++ b/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
@@ -9,12 +9,15 @@ class LobbyPage
Engine.ProfileStart("Create LobbyPage");
let mapCache = new MapCache();
let buddyButton = new BuddyButton(xmppMessages);
+ const accountSettingsButton = Engine.GetGUIObjectByName("accountSettingsButton");
+ accountSettingsButton.onPress = AccountSettingsPage.openPage.bind(null, xmppMessages);
let gameList = new GameList(xmppMessages, buddyButton, mapCache);
let playerList = new PlayerList(xmppMessages, buddyButton, gameList);
this.lobbyPage = {
"buttons": {
"buddyButton": buddyButton,
+ "accountSettingsButton": accountSettingsButton,
"hostButton": new HostButton(dialog, xmppMessages),
"joinButton": new JoinButton(dialog, gameList),
"leaderboardButton": new LeaderboardButton(xmppMessages, leaderboardPage),
diff --git a/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml b/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
index a1854181be..d09f1c88a4 100644
--- a/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
+++ b/binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
@@ -16,16 +16,19 @@