diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index b99d67e416..38c9922ba7 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -23,11 +23,12 @@ block content
 							form-messages(for="passwordResetForm" role="alert")
 							.form-group
 								label(for='email') #{translate("please_enter_email")}
-								input.form-control(
+								input.form-control#email(
 									type='email',
 									name='email',
 									placeholder='email@example.com',
 									required,
+									autocomplete="username",
 									ng-model="email",
 									autofocus
 								)
diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug
index 60009bec48..554030731a 100644
--- a/services/web/app/views/user/setPassword.pug
+++ b/services/web/app/views/user/setPassword.pug
@@ -42,6 +42,7 @@ block content
 									name='password',
 									placeholder='new password',
 									required,
+									autocomplete="new-password",
 									ng-model="password",
 									autofocus,
 									complex-password