diff --git a/ChangeLog b/ChangeLog
index 16ddbe6ca..9e9b0e234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + rfe #1731967 Check for relations support on main page.
 + rfe #2186820 Explanation for using Host table.
 + rfe #1369509 Link to download more themes.
++ rfe #1666487 Add option to generate password on change password page.
 
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index e454a4492..a324b7f57 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -31,20 +31,20 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
         <table class="data">
         <tr class="odd noclick">
             <td colspan="2">
-                <input type="radio" name="nopass" value="1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
-        <?php echo $GLOBALS['strNoPassword'] . "\n"; ?>
+                <input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
+        <label for="nopass_1"><?php echo $GLOBALS['strNoPassword'] . "\n"; ?></label>
             </td>
         </tr>
         <tr class="even noclick">
             <td>
-                <input type="radio" name="nopass" value="0" onclick="document.getElementById('pw_pma_pw').focus();" checked="checked " />
-        <?php echo $GLOBALS['strPassword']; ?>:&nbsp;
+                <input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
+        <label for="nopass_0"><?php echo $GLOBALS['strPassword']; ?>:&nbsp;</label>
             </td>
             <td>
-                <input type="password" name="pma_pw" id="pw_pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
+                <input type="password" name="pma_pw" id="text_pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
         &nbsp;&nbsp;
         <?php echo $GLOBALS['strReType']; ?>:&nbsp;
-                <input type="password" name="pma_pw2" id="pw_pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
+                <input type="password" name="pma_pw2" id="text_pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
             </td>
         </tr>
         <tr>
@@ -67,6 +67,16 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             </label>
         </td>
         </tr>
+        <tr>
+        <td>
+            <?php echo $strGeneratePassword; ?>
+        </td>
+        <td>
+            <input type="button" id="button_generate_password" value="<?php echo $strGenerate; ?>" onclick="suggestPassword()" />
+            <input type="button" id="button_copy_password" value="<?php echo $strCopy; ?>" onclick="suggestPasswordCopy(this.form)" />
+            <input type="text" name="generated_pw" id="generated_pw" />
+        </td>
+        </tr>
         </table>
     </fieldset>
     <fieldset id="fieldset_change_password_footer" class="tblFooters">