diff --git a/src/components/app.js b/src/components/app.js
index 215e78f64..2678b4e9a 100644
--- a/src/components/app.js
+++ b/src/components/app.js
@@ -14,7 +14,7 @@ const pages = {
     button: "log_in",
     button_saving: "logging_in",
     email: true,
-    password: true,
+    password: "current-password",
     link: "amnesia",
     link_text: "forgot_password",
     providers: true
@@ -25,7 +25,7 @@ const pages = {
     button_saving: "signing_up",
     name: true,
     email: true,
-    password: true,
+    password: "new-password",
     providers: true
   },
   amnesia: {
@@ -40,7 +40,7 @@ const pages = {
     title: "recover_password",
     button: "update_password",
     button_saving: "updating_password",
-    password: true,
+    password: "new-password",
     link: "login",
     link_text: "never_mind"
   },
@@ -48,7 +48,7 @@ const pages = {
     title: "complete_your_signup",
     button: "sign_up",
     button_saving: "signing_up",
-    password: true,
+    password: "new-password",
     providers: true
   },
   user: {
diff --git a/src/components/forms/user.js b/src/components/forms/user.js
index 563626b94..f3848f49e 100644
--- a/src/components/forms/user.js
+++ b/src/components/forms/user.js
@@ -77,6 +77,7 @@ export default class UserForm extends Component {
                 name="password"
                 value={password}
                 placeholder={t("form_password_placeholder")}
+                autocomplete={page.password}
                 required
                 oninput={this.handleInput}
               />