diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index a4cc10b40..22fd808b4 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -248,6 +248,7 @@ Template.editProfilePopup.events({
 // XXX For some reason the useraccounts autofocus isnt working in this case.
 // See https://github.com/meteor-useraccounts/core/issues/384
 Template.changePasswordPopup.onRendered(function() {
+  $('.at-pwd-form').show();
   this.find('#at-field-current_password').focus();
 });
 
diff --git a/config/accounts.js b/config/accounts.js
index 07cb99321..cbfb9d4dd 100644
--- a/config/accounts.js
+++ b/config/accounts.js
@@ -126,10 +126,9 @@ AccountsTemplates.configure({
 
 AccountsTemplates.configureRoute('changePwd', {
   redirect() {
-    // XXX We should emit a notification once we have a notification system.
-    // Currently the user has no indication that his modification has been
-    // applied.
-    Popup.back();
+    // We should go back with the popup but we don't since user feedback about the change is within the popup only.
+    // Once we have a global feedback popup mechanism we can use that here and close with the following:
+    // Popup.back();
   },
 });