diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 76d79e404c1..987bfcd20c8 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -18,12 +18,11 @@
         <h2>{{i18n 'user.change_password.choose'}}</h2>
 
         <div class="input">
-          {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
+          {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn autofocus="autofocus"}}
           &nbsp;{{input-tip validation=passwordValidation}}
         </div>
 
         <div class="instructions">
-          <label>{{passwordInstructions}}</label>
           <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
         </div>
 
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6
index ca81dca20e0..49050de210d 100644
--- a/test/javascripts/acceptance/password-reset-test.js.es6
+++ b/test/javascripts/acceptance/password-reset-test.js.es6
@@ -33,7 +33,6 @@ test("Password Reset Page", () => {
   visit("/users/password-reset/myvalidtoken");
   andThen(() => {
     ok(exists(".password-reset input"), "shows the input");
-    ok(find('.password-reset .instructions').html().indexOf('8 char') !== -1, "shows correct min length");
   });
 
   fillIn('.password-reset input', 'perf3ctly5ecur3');