1 files changed, 35 insertions, 27 deletions
diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index cfeacbb93..68119252e 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -19,39 +19,47 @@
   #%]
 
 [% title = "Change Password" %]
-[% PROCESS global/header.html.tmpl %]
+ [% PROCESS global/header.html.tmpl
+    style_urls      = ['skins/standard/admin.css']
+    javascript_urls = ['js/account.js']
+ %]
 
 <p>
   To change your password, enter a new password twice:
 </p>
 
-<form method="post" action="token.cgi">
-  <input type="hidden" name="t" value="[% token FILTER html %]">
-  <input type="hidden" name="a" value="chgpw">
-  <table>
-    <tr>
-      <th align="right">New Password:</th>
-      <td>
-        <input type="password" name="password">
-        (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
-      </td>
-    </tr>
+<div class="flex">
+  <div class="flex-left">
+    <form method="post" action="token.cgi">
+      <input type="hidden" name="t" value="[% token FILTER html %]">
+      <input type="hidden" name="a" value="chgpw">
+      <table>
+        <tr>
+          <th align="right">New Password:</th>
+          <td>
+            <input type="password" name="password" id="new_password1" required>
+          </td>
+        </tr>
 
-    <tr>
-      <th align="right">New Password Again:</th>
-      <td>
-        <input type="password" name="matchpassword">
-      </td>
-    </tr>
+        <tr>
+          <th align="right">New Password Again:</th>
+          <td>
+            <input type="password" name="matchpassword" id="new_password2" required>
+          </td>
+        </tr>
 
-    <tr>
-      <th align="right">&nbsp;</th>
-      <td>
-        <input type="submit" id="update" value="Submit">
-        [% INCLUDE mfa/protected.html.tmpl user=token_user %]
-      </td>
-    </tr>
-  </table>
-</form>
+        <tr>
+          <th align="right">&nbsp;</th>
+          <td>
+            <input type="submit" id="update" value="Submit">
+            [% INCLUDE mfa/protected.html.tmpl user=token_user %]
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+
+  [% INCLUDE "global/password-features.html.tmpl" class="flex-right" password_page="forgot" %]
+</div>
 
 [% PROCESS global/footer.html.tmpl %]