Index: ps/trunk/binaries/data/mods/public/gui/manual/manual.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/manual/manual.xml	(revision 21845)
+++ ps/trunk/binaries/data/mods/public/gui/manual/manual.xml	(revision 21846)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/manual/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
 		<object name="title" style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Information</translatableAttribute>
 		</object>
 
 		<object type="image" sprite="ModernFade" size="20 20 100%-20 100%-58">
 			<object name="mainText" type="text" style="ModernTextPanel"/>
 		</object>
 
 		<object type="button" style="ModernButtonRed" tooltip_style="snToolTip" size="100%-408 100%-52 100%-218 100%-24" hotkey="cancel">
 			<translatableAttribute id="caption">Close</translatableAttribute>
-			<action on="Press"><![CDATA[closeManual();]]></action>
+			<action on="Press">closeManual();</action>
 		</object>
 		<object name="url" type="button" style="ModernButtonRed" size="100%-214 100%-52 100%-24 100%-24" hidden="true">
 			<translatableAttribute id="caption">View Online</translatableAttribute>
 		</object>
 	</object>
 
 </objects>
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js	(revision 21845)
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js	(revision 21846)
@@ -1,307 +1,330 @@
 var g_LobbyIsConnecting = false;
 var g_EncryptedPassword = "";
 var g_PasswordInputIsHidden = false;
-var g_TermsOfServiceRead = false;
-var g_TermsOfUseRead = false;
 var g_DisplayingSystemMessage = false;
 
+var g_Terms = {
+	"Service": {
+		"title": translate("Terms of Service"),
+		"instruction": translate("Please read the Terms of Service"),
+		"file": "prelobby/Terms_of_Service",
+		"read": false
+	},
+	"Use": {
+		"title": translate("Terms of Use"),
+		"instruction": translate("Please read the Terms of Use"),
+		"file": "prelobby/Terms_of_Use",
+		"read": false
+	}
+};
+
 function init()
 {
+	let username = Engine.ConfigDB_GetValue("user", "lobby.login");
+	g_EncryptedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");
+
+	// We only show 10 characters to make it look decent.
+	Engine.GetGUIObjectByName("connectUsername").caption = username;
+	Engine.GetGUIObjectByName("connectPassword").caption = g_EncryptedPassword.substring(0, 10);
+
 	Engine.GetGUIObjectByName("rememberPassword").checked =
 		Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true";
-	g_EncryptedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");
-	if (Engine.ConfigDB_GetValue("user", "lobby.login") && g_EncryptedPassword)
+
+	if (username && g_EncryptedPassword)
 		switchPage("connect");
 }
 
 function lobbyStop()
 {
 	Engine.GetGUIObjectByName("feedback").caption = "";
 
 	if (!g_LobbyIsConnecting)
 		return;
 
 	g_LobbyIsConnecting = false;
 	Engine.StopXmppClient();
 }
 
 function lobbyStartConnect()
 {
 	if (g_LobbyIsConnecting)
 		return;
 
 	if (Engine.HasXmppClient())
 		Engine.StopXmppClient();
 
 	Engine.GetGUIObjectByName("continue").enabled = false;
 	let username = Engine.GetGUIObjectByName("connectUsername").caption;
 	let password = Engine.GetGUIObjectByName("connectPassword").caption;
 	let feedback = Engine.GetGUIObjectByName("feedback");
 	let room = Engine.ConfigDB_GetValue("user", "lobby.room");
 	let history = Number(Engine.ConfigDB_GetValue("user", "lobby.history"));
 
 	feedback.caption = translate("Connecting…");
 	// If they enter a different password, re-encrypt.
 	if (password != g_EncryptedPassword.substring(0, 10))
 		g_EncryptedPassword = Engine.EncryptPassword(password, username);
 	// We just use username as nick for simplicity.
 	Engine.StartXmppClient(username, g_EncryptedPassword, room, username, history);
 	g_LobbyIsConnecting = true;
 	Engine.ConnectXmppClient();
 }
 
 function lobbyStartRegister()
 {
 	if (g_LobbyIsConnecting)
 		return;
 
 	if (Engine.HasXmppClient())
 		Engine.StopXmppClient();
 
 	Engine.GetGUIObjectByName("continue").enabled = false;
 	let account = Engine.GetGUIObjectByName("registerUsername").caption;
 	let password = Engine.GetGUIObjectByName("registerPassword").caption;
 	let feedback = Engine.GetGUIObjectByName("feedback");
 
 	feedback.caption = translate("Registering…");
 	g_EncryptedPassword = Engine.EncryptPassword(password, account);
 	Engine.StartRegisterXmppClient(account, g_EncryptedPassword);
 	g_LobbyIsConnecting = true;
 	Engine.ConnectXmppClient();
 }
 
 function onTick()
 {
 	let pageRegisterHidden = Engine.GetGUIObjectByName("pageRegister").hidden;
 	let username = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectUsername" : "registerUsername").caption;
 	let password = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectPassword" : "registerPassword").caption;
 	let passwordAgain = Engine.GetGUIObjectByName("registerPasswordAgain").caption;
 
 	let agreeTerms = Engine.GetGUIObjectByName("registerAgreeTerms");
 	let feedback = Engine.GetGUIObjectByName("feedback");
 	let continueButton = Engine.GetGUIObjectByName("continue");
 
 	// Do not change feedback while connecting.
 	if (g_LobbyIsConnecting) {}
 	// Do not show feedback on the welcome screen.
 	else if (!Engine.GetGUIObjectByName("pageWelcome").hidden)
 	{
 		feedback.caption = "";
 		g_DisplayingSystemMessage = false;
 	}
 	// Check that they entered a username.
 	else if (!username)
 	{
 		continueButton.enabled = false;
 		feedback.caption = translate("Please enter your username");
 	}
 	// Prevent registation (but not login) with non-alphanumerical characters
 	else if (!pageRegisterHidden && (!username.match(/^[a-z0-9._-]*$/i) || username.length > 20))
 	{
 		continueButton.enabled = false;
 		feedback.caption = translate("Invalid username");
 	}
 	// Check that they entered a password.
 	else if (!password)
 	{
 		continueButton.enabled = false;
 		feedback.caption = pageRegisterHidden ?
 			translateWithContext("login", "Please enter your password") :
 			translateWithContext("register", "Please enter your password");
 	}
 	// Allow them to connect if tests pass up to this point.
 	else if (pageRegisterHidden)
 	{
 		if (!g_DisplayingSystemMessage)
 			feedback.caption = "";
 		continueButton.enabled = true;
 	}
 	// Check that they entered their password again.
 	else if (!passwordAgain)
 	{
 		continueButton.enabled = false;
 		feedback.caption = translate("Please enter your password again");
 	}
 	// Check that the passwords match.
 	else if (passwordAgain != password)
 	{
 		continueButton.enabled = false;
 		feedback.caption = translate("Passwords do not match");
 	}
 	// Check that they read the Terms of Service.
-	else if (!g_TermsOfServiceRead)
+	else if (!g_Terms.Service.read)
 	{
 		continueButton.enabled = false;
-		feedback.caption = translate("Please read the Terms of Service");
+		feedback.caption = g_Terms.Service.instruction;
 	}
 	// Check that they read the Terms of Use.
-	else if (!g_TermsOfUseRead)
+	else if (!g_Terms.Use.read)
 	{
 		continueButton.enabled = false;
-		feedback.caption = translate("Please read the Terms of Use");
+		feedback.caption = g_Terms.Use.instruction;
 	}
 	// Check that they agree to the terms of service and use.
 	else if (!agreeTerms.checked)
 	{
 		continueButton.enabled = false;
 		feedback.caption = translate("Please agree to the Terms of Service and Terms of Use");
 	}
 	// Allow them to register.
 	else
 	{
 		if (!g_DisplayingSystemMessage)
 			feedback.caption = "";
 		continueButton.enabled = true;
 	}
 
 	// Handle queued messages from the XMPP client (if running and if any)
 	let message;
 	while ((message = Engine.LobbyGuiPollNewMessage()) != undefined)
 	{
 		// TODO: Properly deal with unrecognized messages
 		if (message.type != "system" || !message.level)
 			continue;
 
 		g_LobbyIsConnecting = false;
 
 		switch (message.level)
 		{
 		case "error":
 		{
 			Engine.GetGUIObjectByName("feedback").caption = message.text;
 			g_DisplayingSystemMessage = true;
 			Engine.StopXmppClient();
 			break;
 		}
 		case "disconnected":
 		{
 			Engine.GetGUIObjectByName("feedback").caption = message.reason ||
 				translate("Unknown error. This usually occurs because the same IP address is not allowed to register more than one account within one hour.");
 			g_DisplayingSystemMessage = true;
 			Engine.StopXmppClient();
 			break;
 		}
 		case "registered":
 			Engine.GetGUIObjectByName("feedback").caption = translate("Registered");
 			g_DisplayingSystemMessage = true;
 			Engine.GetGUIObjectByName("connectUsername").caption = username;
 			Engine.GetGUIObjectByName("connectPassword").caption = password;
 			Engine.StopXmppClient();
 			switchPage("connect");
 			break;
 		case "connected":
 		{
 			Engine.PopGuiPage();
 			Engine.SwitchGuiPage("page_lobby.xml", { "dialog": false });
 			saveSettingAndWriteToUserConfig("playername.multiplayer", username);
 			saveSettingAndWriteToUserConfig("lobby.login", username);
 			// We only store the encrypted password, so make sure to re-encrypt it if changed before saving.
 			if (password != g_EncryptedPassword.substring(0, 10))
 				g_EncryptedPassword = Engine.EncryptPassword(password, username);
 			Engine.ConfigDB_CreateValue("user", "lobby.password", g_EncryptedPassword);
 			if (Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true")
 				Engine.ConfigDB_WriteValueToFile("user", "lobby.password", g_EncryptedPassword, "config/user.cfg");
 			else
 			{
 				Engine.ConfigDB_RemoveValue("user", "lobby.password");
 				Engine.ConfigDB_WriteFile("user", "config/user.cfg");
 			}
 			break;
 		}
 		}
 	}
 }
 
 function switchPage(page)
 {
 	// First hide everything.
 	if (!Engine.GetGUIObjectByName("pageWelcome").hidden)
 		Engine.GetGUIObjectByName("pageWelcome").hidden = true;
 	else if (!Engine.GetGUIObjectByName("pageRegister").hidden)
 	{
 		Engine.GetGUIObjectByName("pageRegister").hidden = true;
 		Engine.GetGUIObjectByName("continue").hidden = true;
 		let dialog = Engine.GetGUIObjectByName("dialog");
 		let newSize = dialog.size;
 		newSize.bottom -= 150;
 		dialog.size = newSize;
 	}
 	else if (!Engine.GetGUIObjectByName("pageConnect").hidden)
 	{
 		Engine.GetGUIObjectByName("pageConnect").hidden = true;
 		Engine.GetGUIObjectByName("continue").hidden = true;
 	}
 
 	// Then show appropriate page.
 	switch(page)
 	{
 	case "welcome":
 		Engine.GetGUIObjectByName("pageWelcome").hidden = false;
 		break;
 	case "register":
 	{
 		let dialog = Engine.GetGUIObjectByName("dialog");
 		let newSize = dialog.size;
 		newSize.bottom += 150;
 		dialog.size = newSize;
 
 		Engine.GetGUIObjectByName("pageRegister").hidden = false;
 		Engine.GetGUIObjectByName("continue").caption = translate("Register");
 		Engine.GetGUIObjectByName("continue").hidden = false;
 		break;
 	}
 	case "connect":
 		Engine.GetGUIObjectByName("pageConnect").hidden = false;
 		Engine.GetGUIObjectByName("continue").caption = translate("Connect");
 		Engine.GetGUIObjectByName("continue").hidden = false;
 		break;
 	}
 }
-function openTermsOfService()
+
+function openTerms(terms)
 {
-	g_TermsOfServiceRead = true;
+	g_Terms[terms].read = true;
+
+	Engine.GetGUIObjectByName("registerAgreeTerms").enabled = g_Terms.Service.read && g_Terms.Use.read;
+
 	Engine.PushGuiPage("page_manual.xml", {
-		"page": "prelobby/Terms_of_Service",
-		"title": translate("Terms of Service"),
+		"page": g_Terms[terms].file,
+		"title": g_Terms[terms].title
 	});
 }
 
-function openTermsOfUse()
+function prelobbyConnect()
 {
-	g_TermsOfUseRead = true;
-	Engine.PushGuiPage("page_manual.xml", {
-		"page": "prelobby/Terms_of_Use",
-		"title": translate("Terms of Use"),
-	});
+	if (!Engine.GetGUIObjectByName("pageConnect").hidden)
+		lobbyStartConnect();
+	else if (!Engine.GetGUIObjectByName("pageRegister").hidden)
+		lobbyStartRegister();
 }
 
 function prelobbyCancel()
 {
 	lobbyStop();
 
 	Engine.GetGUIObjectByName("feedback").caption = "";
 
 	if (Engine.GetGUIObjectByName("pageWelcome").hidden)
 		switchPage("welcome");
 	else
 		Engine.PopGuiPage();
 }
 
 function toggleRememberPassword()
 {
 	let checkbox = Engine.GetGUIObjectByName("rememberPassword");
 	let enabled = Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true";
 	if (!checkbox.checked && enabled && Engine.ConfigDB_GetValue("user", "lobby.password"))
 	{
 		messageBox(
 			360, 160,
 			translate("Are you sure you want to delete the password after connecting?"),
 			translate("Confirmation"),
 			[translate("No"), translate("Yes")],
 			[function() { checkbox.checked = true; },
 			 function() { saveSettingAndWriteToUserConfig("lobby.rememberpassword", String(!enabled)); }]
 		);
 	}
 	else
 		saveSettingAndWriteToUserConfig("lobby.rememberpassword", String(!enabled));
 }
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml	(revision 21845)
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml	(revision 21846)
@@ -1,127 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/prelobby/"/>
 
 	<object hotkey="lobby">
 		<action on="Press">
 			lobbyStop();
 			Engine.PopGuiPage();
 		</action>
 	</object>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
 	<object name="dialog" type="image" style="ModernDialog" size="50%-230 50%-130 50%+230 50%+130">
 
-		<action on="Tick">
-			onTick();
-		</action>
+		<action on="Tick">onTick();</action>
 
 		<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
 		</object>
 
 		<object name="pageWelcome" size="0 32 100% 100%">
 			<object type="button" size="50 12 100%-50 68" style="ModernButtonRed">
 				<translatableAttribute id="caption">Create a new account</translatableAttribute>
 				<action on="Press">switchPage("register");</action>
 			</object>
 			<object type="button" size="50 80 100%-50 136" style="ModernButtonRed">
 				<translatableAttribute id="caption">Login to an existing account</translatableAttribute>
 				<action on="Press">switchPage("connect");</action>
 			</object>
 		</object>
 		<object name="pageConnect" size="0 32 100% 100%" hidden="true">
 			<object type="text" size="0 0 100% 30" style="ModernLabelText">
 				<translatableAttribute id="caption">Connect to the game lobby</translatableAttribute>
 			</object>
 			<object name="connectUsernameLabel" type="text" size="20 40 50% 70" style="ModernRightLabelText">
 				<translatableAttribute id="caption">Login:</translatableAttribute>
 			</object>
-			<object name="connectUsername" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
-				<action on="Load">
-					this.caption = Engine.ConfigDB_GetValue("user", "lobby.login");
-				</action>
-			</object>
+			<object name="connectUsername" type="input" size="50%+10 40 100%-20 64" style="ModernInput"/>
+
 			<object name="connectPasswordLabel" type="text" size="20 80 50% 110" style="ModernRightLabelText">
 				<translatableAttribute id="caption">Password:</translatableAttribute>
 			</object>
 			<object name="connectPassword" type="input" size="50%+10 80 100%-20 104" style="ModernInput" mask="true" mask_char="*">
-				<action on="Load">
-					// We only show 10 characters to make it look decent.
-					this.caption = Engine.ConfigDB_GetValue("user", "lobby.password").substring(0, 10);
-				</action>
-				<action on="Press">
-					lobbyStartConnect();
-				</action>
+				<action on="Press">lobbyStartConnect();</action>
 			</object>
 			<object name="rememberPassword" type="checkbox" size="50%-19 115 50% 135" style="ModernTickBox">
-				<action on="Press">
-					toggleRememberPassword();
-				</action>
+				<action on="Press">toggleRememberPassword();</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">
 
 			<object type="text" size="0 0 100% 30" style="ModernLabelText">
 				<translatableAttribute id="caption">Registration</translatableAttribute>
 			</object>
 
 			<object name="registerUsernameLabel" type="text" size="10 40 50% 70" style="ModernRightLabelText">
 				<translatableAttribute id="caption">Login:</translatableAttribute>
 			</object>
 			<object name="registerUsername" type="input" size="50%+10 40 100%-20 64" style="ModernInput"/>
 
 			<object name="registerPasswordLabel" type="text" size="10 80 50% 110" style="ModernRightLabelText">
 				<translatableAttribute id="caption">Password:</translatableAttribute>
 			</object>
 			<object name="registerPassword" type="input" size="50%+10 80 100%-20 104" style="ModernInput" mask="true" mask_char="*"/>
 
 			<object name="registerPasswordAgainLabel" type="text" size="10 120 50% 150" style="ModernRightLabelText">
 				<translatableAttribute id="caption">Password again:</translatableAttribute>
 			</object>
 			<object name="registerPasswordAgain" type="input" size="50%+10 120 100%-20 144" style="ModernInput" mask="true" mask_char="*"/>
 
 			<object type="button" size="20 160 100%-20 188" style="ModernButtonRed">
 				<translatableAttribute id="caption">Terms of Service</translatableAttribute>
-				<action on="Press">openTermsOfService();</action>
+				<action on="Press">openTerms("Service");</action>
 			</object>
 
 			<object type="button" size="20 200 100%-20 228" style="ModernButtonRed">
 				<translatableAttribute id="caption">Terms of Use</translatableAttribute>
-				<action on="Press">openTermsOfUse();</action>
+				<action on="Press">openTerms("Use");</action>
 			</object>
 
 			<object name="registerAgreeTermsLabel" type="text" size="20 240 100%-80 270" style="ModernLabelText">
 				<translatableAttribute id="caption">I have read and agree to the Terms of Service and Terms of Use:</translatableAttribute>
 			</object>
-			<object name="registerAgreeTerms" type="checkbox" size="100%-60 245 100%-20 270" style="ModernTickBox" enabled="false">
-				<action on="Tick"><![CDATA[this.enabled = g_TermsOfServiceRead && g_TermsOfUseRead;]]></action>
-			</object>
+
+			<object name="registerAgreeTerms" type="checkbox" size="100%-60 245 100%-20 270" style="ModernTickBox" enabled="false"/>
 
 		</object>
+
 		<object name="feedback" type="text" size="50 100%-110 100%-50 100%-50" style="ModernLabelText" textcolor="red"/>
 		<object name="cancel" type="button" size="18 100%-45 50%-5 100%-17" style="ModernButtonRed" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">prelobbyCancel();</action>
 		</object>
 		<object name="continue" hotkey="confirm" type="button" size="50%+5 100%-45 100%-18 100%-17" style="ModernButtonRed" enabled="false" hidden="true">
 			<translatableAttribute id="caption">Connect</translatableAttribute>
-			<action on="Press">
-				if (!Engine.GetGUIObjectByName("pageConnect").hidden)
-					lobbyStartConnect();
-				else if (!Engine.GetGUIObjectByName("pageRegister").hidden)
-					lobbyStartRegister();
-			</action>
+			<action on="Press">prelobbyConnect();</action>
 		</object>
 
 	</object>
 
 </objects>