diff --git a/ChangeLog b/ChangeLog
index 56f5041e9..0b0979cd7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-02-11 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_privileges.php: bug 818654, password not copied
+
 2004-02-08 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
     * lang/norwegian:  Updated, thanks to Sven-Erik Andersen (sven-erik).
diff --git a/server_privileges.php b/server_privileges.php
index 942b9fbf7..b269c00bf 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -545,6 +545,12 @@ if (!empty($change_copy)) {
     } else {
         $row = PMA_DBI_fetch_assoc($res);
         extract($row, EXTR_OVERWRITE);
+        // Recent MySQL versions have the field "Password" in mysql.user,
+        // so the previous extract creates $Password but this script
+        // uses $password
+        if (!isset($password) && isset($Password)) {
+            $password=$Password;
+        }
         PMA_DBI_free_result($res);
         $queries = array();
     }