diff --git a/binaries/data/mods/public/gui/lobby/prelobby.js b/binaries/data/mods/public/gui/lobby/prelobby.js
index 240ac80cc2..96b91e40a9 100644
--- a/binaries/data/mods/public/gui/lobby/prelobby.js
+++ b/binaries/data/mods/public/gui/lobby/prelobby.js
@@ -1,9 +1,29 @@
 var g_LobbyIsConnecting = false;
 var g_EncrytedPassword = "";
+var g_PasswordInputIsHidden = false;
 
 function init()
 {
 	g_EncrytedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");
+	var connectPassword = getGUIObjectByName("connectPassword");
+	if (connectPassword.caption) {
+		g_PasswordInputIsHidden = true;
+		connectPassword.hidden = true;
+		getGUIObjectByName("connectPasswordLabel").hidden = true;
+		//getGUIObjectByName("nickPanel").size = "64 80 100%-32 104";
+		getGUIObjectByName("nickToggle").size = "100%-64 80 100%-32 104";
+	}
+}
+
+function showNickInput()
+{
+	getGUIObjectByName("nickToggle").hidden = true;
+	getGUIObjectByName("nickPanel").hidden = false;
+	if (g_PasswordInputIsHidden)
+	{
+		getGUIObjectByName("connectPasswordLabel").hidden = false;
+		getGUIObjectByName("connectPassword").hidden = false;
+	}
 }
 
 function lobbyStop()
@@ -20,7 +40,7 @@ function lobbyStop()
 
 function lobbyStart()
 {
-	if (g_LobbyIsConnecting != false)
+	if (g_LobbyIsConnecting)
 		return;
 
 	if (Engine.HasXmppClient())
@@ -30,10 +50,9 @@ function lobbyStart()
 	var password = getGUIObjectByName("connectPassword").caption;
 	var feedback = getGUIObjectByName("connectFeedback");
 	// Use username as nick unless overridden.
-	if (getGUIObjectByName("nickPanel").hidden == true)
-		var nick = sanitizePlayerName(username, true, true);
-	else
-		var nick = sanitizePlayerName(getGUIObjectByName("joinPlayerName").caption, true, true);
+	var nickPanelHidden = getGUIObjectByName("nickPanel").hidden;
+	var nick = sanitizePlayerName(nickPanelHidden ? username :
+			getGUIObjectByName("joinPlayerName").caption, true, true);
 	if (!username || !password)
 	{
 		feedback.caption = "Username or password empty";
diff --git a/binaries/data/mods/public/gui/lobby/prelobby.xml b/binaries/data/mods/public/gui/lobby/prelobby.xml
index f7854a4bf2..ae3223c2d9 100644
--- a/binaries/data/mods/public/gui/lobby/prelobby.xml
+++ b/binaries/data/mods/public/gui/lobby/prelobby.xml
@@ -26,7 +26,7 @@
 			<object type="text" style="CenteredLabelText" size="0 0 400 30">
 				Connect to the game lobby.
 			</object>
-			<object type="text" size="0 40 200 70" style="RightLabelText">
+			<object name="connectUsernameLabel" type="text" size="0 40 200 70" style="RightLabelText">
 				Login:
 			</object>
 			<object name="connectUsername" type="input" size="210 40 100%-32 64" style="StoneInput">
@@ -34,7 +34,7 @@
 					this.caption = Engine.ConfigDB_GetValue("user", "lobby.login");
 				</action>
 			</object>
-			<object type="text" size="0 80 200 110" style="RightLabelText">
+			<object name="connectPasswordLabel" type="text" size="0 80 200 110" style="RightLabelText">
 				Password:
 			</object>
 			<object name="connectPassword" type="input" size="210 80 100%-32 104" style="StonePasswordInput">
@@ -57,10 +57,9 @@
 			</object>
 			<object name="nickToggle" type="button" style="StoneButton" size="100%-64 120 100%-32 144">
 				<![CDATA[<<]]>
-				<action on="Press"><![CDATA[
-					this.hidden = true;
-					getGUIObjectByName("nickPanel").hidden = false;
-				]]></action>
+				<action on="Press">
+					showNickInput();
+				</action>
 			</object>
 			<object name="connectFeedback" type="text" style="CenteredLabelText" size="32 150 100%-32 180" textcolor="red"/>
 			<object type="button" size="32 100%-60 122 100%-32" style="StoneButton">
@@ -90,7 +89,7 @@
 			<object type="text" style="CenteredLabelText" size="0 0 400 30">
 				Registration.
 			</object>
-			<object type="text" size="0 40 200 70" style="RightLabelText">
+			<object type="text" size="0 36 200 70" style="RightLabelText">
 				Password again:
 			</object>
 			<object name="registerPasswordAgain" type="input" size="210 40 100%-32 64" style="StonePasswordInput">