diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
index 5f63f7d..826ef31 100755
--- a/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
+++ b/forms/common-themes/src/main/resources/theme/login/base/login-update-password.ftl
@@ -11,7 +11,7 @@
<label for="password-new" class="${properties.kcLabelClass!}">${rb.passwordNew}</label>
</div>
<div class="${properties.kcInputWrapperClass!}">
- <input type="password" id="password-new" name="password-new" class="${properties.kcInputClass!}" />
+ <input type="password" id="password-new" name="password-new" class="${properties.kcInputClass!}" autofocus />
</div>
</div>