diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index 2cce4467b..a7f650005 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -16,7 +16,7 @@
 
     <div class="input m20t">
       <input type="password" placeholder="{{'Your password'|translate}}"
-      name="password" ng-model="pass.password">
+      name="password" ng-model="pass.password" autofocus>
     </div>
   </div>
   <div class="row">