diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html
index 88b1a9c6d..50e4d2177 100644
--- a/modules/account/front/descriptor/index.html
+++ b/modules/account/front/descriptor/index.html
@@ -143,13 +143,15 @@
             ng-if="$ctrl.askOldPass"
             label="Old password"
             ng-model="$ctrl.oldPassword"
-            type="password">
+            type="password"
+            vn-focus>
         </vn-textfield>
         <vn-textfield
             label="New password"
             ng-model="$ctrl.newPassword"
             type="password"
-            info="{{'Password requirements' | translate:$ctrl.passRequirements}}">
+            info="{{'Password requirements' | translate:$ctrl.passRequirements}}"
+            vn-focus>
         </vn-textfield>
         <vn-textfield
             label="Repeat password"
diff --git a/modules/account/front/ldap/index.html b/modules/account/front/ldap/index.html
index 2ba1ceda6..435247f91 100644
--- a/modules/account/front/ldap/index.html
+++ b/modules/account/front/ldap/index.html
@@ -79,7 +79,8 @@
     <tpl-body>
         <vn-textfield
             label="Username"
-            ng-model="$ctrl.syncUser">
+            ng-model="$ctrl.syncUser"
+            vn-focus>
         </vn-textfield>
         <vn-textfield
             label="Password"