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();
   },
 });