Index: ps/trunk/binaries/data/mods/public/gui/prelobby/common/credentials/credentials.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/common/credentials/credentials.js	(revision 21908)
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/common/credentials/credentials.js	(revision 21909)
@@ -1,86 +1,91 @@
 function checkUsername(register)
 {
 	let username = Engine.GetGUIObjectByName("username").caption;
 	if (!username)
 		return translate("Please enter your username");
 
 	if (register && (!username.match(/^[a-z0-9._-]*$/i) || username.length > 20))
 		return translate("Invalid username");
 
 	return "";
 }
 
 function checkPassword(register)
 {
-	if (!Engine.GetGUIObjectByName("password").caption)
+	let password = Engine.GetGUIObjectByName("password").caption;
+
+	if (!password)
 		return register ?
 			translateWithContext("register", "Please enter your password") :
 			translateWithContext("login", "Please enter your password");
 
+	if (register && password.length < 8)
+		return translate("Please choose a longer password");
+
 	return "";
 }
 
 function checkPasswordConfirmation()
 {
 	let password1 = Engine.GetGUIObjectByName("password").caption;
 	if (!password1)
 		return translate("Please enter your password again");
 
 	let password2 = Engine.GetGUIObjectByName("passwordRepeat").caption;
 	if (password1 != password2)
 		return translate("Passwords do not match");
 
 	return "";
 }
 
 function initRememberPassword()
 {
 	Engine.GetGUIObjectByName("rememberPassword").checked =
 		Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true";
 }
 
 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")],
 			[
 				() => { checkbox.checked = true; },
 				() => { saveSettingAndWriteToUserConfig("lobby.rememberpassword", String(!enabled)); }
 			]);
 	else
 		saveSettingAndWriteToUserConfig("lobby.rememberpassword", String(!enabled));
 }
 
 function getEncryptedPassword()
 {
 	let typedUnencryptedPassword = Engine.GetGUIObjectByName("password").caption;
 	let storedEncryptedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");
 
 	if (typedUnencryptedPassword == storedEncryptedPassword.substr(0, 10))
 		return storedEncryptedPassword;
 
 	return Engine.EncryptPassword(
 		typedUnencryptedPassword,
 		Engine.GetGUIObjectByName("username").caption);
 }
 
 function saveCredentials()
 {
 	let username = Engine.GetGUIObjectByName("username").caption;
 	saveSettingAndWriteToUserConfig("playername.multiplayer", username);
 	saveSettingAndWriteToUserConfig("lobby.login", username);
 
 	if (Engine.ConfigDB_GetValue("user", "lobby.rememberpassword") == "true")
 		saveSettingAndWriteToUserConfig("lobby.password", getEncryptedPassword());
 	else
 	{
 		Engine.ConfigDB_RemoveValue("user", "lobby.password");
 		Engine.ConfigDB_WriteFile("user", "config/user.cfg");
 	}
 }