diff --git a/ChangeLog b/ChangeLog
index 6449c1af7..8441bc7f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Geoffray Warnants - amnsk
 + patch #2798592 [import] Progress bar, 
   thanks to Tomas Srnka - tomassrnka
+- bug [gui] Generate Password not working for 'Change Login Information', only for 'Change password'
 
 3.2.1.0 (not yet released)
 - bug #2799009 Login with ipv6 IP address breaks redirect
diff --git a/js/server_privileges.js b/js/server_privileges.js
index a6270165c..3495e0304 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -73,23 +73,23 @@ function checkAddUser(the_form)
 /**
  * Generate a new password and copy it to the password input areas
  *
- * @param   string   the form name
+ * @param   object   the form that holds the password fields
  *
  * @return  boolean  always true
  */
-function suggestPassword() {
+function suggestPassword(passwd_form) {
     // restrict the password to just letters and numbers to avoid problems:
     // "editors and viewers regard the password as multiple words and
     // things like double click no longer work"
     var pwchars = "abcdefhjmnpqrstuvwxyz23456789ABCDEFGHJKLMNPQRSTUVWYXZ";
     var passwordlength = 16;    // do we want that to be dynamic?  no, keep it simple :)
-    var passwd = document.getElementById('generated_pw');
+    var passwd = passwd_form.generated_pw;
     passwd.value = '';
 
     for ( i = 0; i < passwordlength; i++ ) {
         passwd.value += pwchars.charAt( Math.floor( Math.random() * pwchars.length ) )
     }
-    document.getElementById('text_pma_pw').value = passwd.value;
-    document.getElementById('text_pma_pw2').value = passwd.value;
+    passwd_form.text_pma_pw.value = passwd.value;
+    passwd_form.text_pma_pw2.value = passwd.value;
     return true;
 }
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 35960ecb7..d44e22e24 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -72,7 +72,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             <?php echo $strGeneratePassword; ?>
         </td>
         <td>
-            <input type="button" id="button_generate_password" value="<?php echo $strGenerate; ?>" onclick="suggestPassword()" />
+            <input type="button" id="button_generate_password" value="<?php echo $strGenerate; ?>" onclick="suggestPassword(this.form)" />
             <input type="text" name="generated_pw" id="generated_pw" />
         </td>
         </tr>
diff --git a/server_privileges.php b/server_privileges.php
index 36be2cfb7..78e975fee 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -783,7 +783,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
        . '    ' . $GLOBALS['strGeneratePassword'] . ':' . "\n"
        . '</label>' . "\n"
        . '<span class="options">' . "\n"
-       . '    <input type="button" id="button_generate_password" value="' . $GLOBALS['strGenerate'] . '" onclick="suggestPassword()" />' . "\n"
+       . '    <input type="button" id="button_generate_password" value="' . $GLOBALS['strGenerate'] . '" onclick="suggestPassword(this.form)" />' . "\n"
        . '</span>' . "\n"
        . '<input type="text" name="generated_pw" id="generated_pw" />' . "\n"
        . '</div>' . "\n"