diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index b237017f2..6ccc5bb22 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -102,6 +102,12 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return isSaving ? I18n.t('saving') : I18n.t('save');
   },
 
+  reset() {
+    this.setProperties({
+      passwordProgress: null
+    });
+  },
+
   passwordProgress: null,
 
   actions: {
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6
index b4f0e0baf..b26648042 100644
--- a/app/assets/javascripts/discourse/routes/preferences.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences.js.es6
@@ -8,6 +8,7 @@ export default RestrictedUserRoute.extend({
   },
 
   setupController(controller, user) {
+    controller.reset();
     controller.setProperties({
       model: user,
       newNameInput: user.get('name')