diff --git a/ChangeLog b/ChangeLog
index e64e92570..2f463f3c3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-09-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_privileges.php: stay on the form when passwords don't match
+      (after the js alert)
+
 2004-09-14 Michal Čihař  <michal@cihar.com>
     * themes.php, libraries/common.lib.php, libraries/defines.lib.php,
       libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php,
diff --git a/server_privileges.php b/server_privileges.php
index 6386a0915..c0415991a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1230,7 +1230,7 @@ if (empty($adduser) && empty($checkprivs)) {
         }
         if (empty($dbname)) {
             echo '    <li>' . "\n"
-               . '        <form action="server_privileges.php" method="post" onsubmit="checkPassword(this);">' . "\n"
+               . '        <form action="server_privileges.php" method="post" onsubmit="return checkPassword(this);">' . "\n"
                . PMA_generate_common_hidden_inputs('', '', 3)
                . '            <input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '            <input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
@@ -1259,7 +1259,7 @@ if (empty($adduser) && empty($checkprivs)) {
                . '        </form>' . "\n"
                . '    </li>' . "\n"
                . '    <li>' . "\n"
-               . '        <form action="server_privileges.php" method="post" onsubmit="checkPassword(this);">' . "\n"
+               . '        <form action="server_privileges.php" method="post" onsubmit="return checkPassword(this);">' . "\n"
                . PMA_generate_common_hidden_inputs('', '', 3)
                . '            <input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '            <input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"