diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl
index b37f67943d..378e706f17 100644
--- a/admin/templates/default/account_form.tpl
+++ b/admin/templates/default/account_form.tpl
@@ -23,7 +23,9 @@ function check_password(id)
 	if (password && (password2 || id == 'password2') && password != password2)
 	{
 		alert('{lang_passwds_unequal}');
-		document.getElementById('password2').focus();
+		document.getElementById('password2').value = '';
+		document.getElementById('password').select();
+		document.getElementById('password').focus();
 		return false;
 	}
 	return true;
diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl
index 3970130928..0d6587fcb6 100644
--- a/admin/templates/default/account_form_ldap.tpl
+++ b/admin/templates/default/account_form_ldap.tpl
@@ -24,7 +24,9 @@ function check_password(id)
 	if (password && (password2 || id == 'password2') && password != password2)
 	{
 		alert('{lang_passwds_unequal}');
-		document.getElementById('password2').focus();
+		document.getElementById('password2').value = '';
+		document.getElementById('password').select();
+		document.getElementById('password').focus();
 		return false;
 	}
 	return true;