diff --git a/ChangeLog b/ChangeLog
index 6ddf05d2d..550bfd924 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-05-17 Marc Delisle  <lem9@users.sourceforge.net>
+    * server_privileges.php, libraries/server_privileges.js:
+      make the password generator work also on user account editing
+
 2005-05-17 Olivier Mueller <om@omnis.ch>
     * server_privileges.php, libraries/server_privileges.js: RFE #1197482,
       password generator on user creation.  RFC: ok like that?  TODO: add strings.
diff --git a/libraries/server_privileges.js b/libraries/server_privileges.js
index a1e0910ce..3dc35056d 100644
--- a/libraries/server_privileges.js
+++ b/libraries/server_privileges.js
@@ -110,7 +110,7 @@ function suggestPassword(the_form)
     passwd+=pwchars.charAt(Math.floor(Math.random()*pwchars.length))
   }
 
-  document.forms[the_form].generated_pw.value = passwd;
+  the_form.generated_pw.value = passwd;
   return true;
 }
 
@@ -124,8 +124,8 @@ function suggestPassword(the_form)
  */
 function suggestPasswordCopy(the_form) 
 {
-  document.forms[the_form].pma_pw.value = document.forms[the_form].generated_pw.value;
-  document.forms[the_form].pma_pw2.value = document.forms[the_form].generated_pw.value;
+  the_form.pma_pw.value = the_form.generated_pw.value;
+  the_form.pma_pw2.value = the_form.generated_pw.value;
   return true;
 }
 
diff --git a/server_privileges.php b/server_privileges.php
index 275c5c503..088c539ed 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -556,8 +556,8 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0)
        . $spaces . '        </label>' . "\n"
        . $spaces . '    </td>' . "\n"
        . $spaces . '    <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
-       . $spaces . '        <input type="button" value="Generate" onClick="suggestPassword(\'usersForm\', \'generated_pw\')">' . "\n"
-       . $spaces . '        <input type="button" value="Copy" onClick="suggestPasswordCopy(\'usersForm\')">' . "\n"
+       . $spaces . '        <input type="button" value="Generate" onClick="suggestPassword(this.form, \'generated_pw\')">' . "\n"
+       . $spaces . '        <input type="button" value="Copy" onClick="suggestPasswordCopy(this.form)">' . "\n"
        . $spaces . '        &nbsp;</td>' . "\n"
        . $spaces . '    <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
        . $spaces . '        <input type="text" name="generated_pw" id="generated_pw" class="textfield"/>' . "\n"