diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index d9291e3331..182cfd2253 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -20,7 +20,7 @@ block content
 									name='email',
 									required,
 									placeholder='email@example.com',
-									focus="true"
+									autofocus="true"
 								)
 							.form-group
 								input.form-control(
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index 68bc1def04..5d0647c58f 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -56,7 +56,7 @@ block content
 														required,
 														ng-model="email",
 														ng-model-options="{ updateOn: 'blur' }",
-														focus="true"
+														autofocus="true"
 													)
 													span.small.text-primary(ng-show="registerForm.email.$invalid && registerForm.email.$dirty")
 														| #{translate("must_be_email_address")}
@@ -100,7 +100,7 @@ block content
 														required,
 														ng-model="email",
 														ng-model-options="{ updateOn: 'blur' }",
-														focus="true"
+														autofocus="true"
 													)
 													span.small.text-primary(ng-show="registerLdapForm.email.$invalid && registerLdapForm.email.$dirty")
 														| #{translate("must_be_email_address")}
@@ -133,7 +133,7 @@ block content
 														required,
 														ng-model="email",
 														ng-model-options="{ updateOn: 'blur' }",
-														focus="true"
+														autofocus="true"
 													)
 													span.small.text-primary(ng-show="registerSamlForm.email.$invalid && registerSamlForm.email.$dirty")
 														| #{translate("must_be_email_address")}
diff --git a/services/web/modules/user-activate/app/views/user/activate.pug b/services/web/modules/user-activate/app/views/user/activate.pug
index 69ca0d0652..229388d371 100644
--- a/services/web/modules/user-activate/app/views/user/activate.pug
+++ b/services/web/modules/user-activate/app/views/user/activate.pug
@@ -51,7 +51,7 @@ block content
 									required,
 									ng-model="password",
 									complex-password,
-									focus="true"
+									autofocus="true"
 								)
 								span.small.text-primary(ng-show="activationForm.password.$error.complexPassword", ng-bind-html="complexPasswordErrorMessage")
 							.actions