diff --git a/src/layouts/login-form.html b/src/layouts/login-form.html
index 0b5f13fc2c..fe6211be69 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.html
@@ -53,6 +53,7 @@
             id='passwordInput'
             label="[[localize('ui.login-form.password')]]"
             type='password'
+            autofocus
             invalid='[[errorMessage]]'
             error-message='[[errorMessage]]'
             value='{{password}}'