diff --git a/packages/accounts-ui-unstyled/login_buttons_dropdown.html b/packages/accounts-ui-unstyled/login_buttons_dropdown.html
index 29830be9b4..d533f0be00 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dropdown.html
+++ b/packages/accounts-ui-unstyled/login_buttons_dropdown.html
@@ -13,10 +13,14 @@
           <a class="login-close-text">Close</a>
           <div class="login-close-text-clear"></div>
 
-          {{#if inChangePasswordFlow}}
-            {{> loginButtonsChangePassword}}
+          {{#if inMessageOnlyFlow}}
+            {{> loginButtonsMessages}}
           {{else}}
-            {{> loginButtonsLoggedInDropdownActions}}
+            {{#if inChangePasswordFlow}}
+              {{> loginButtonsChangePassword}}
+            {{else}}
+              {{> loginButtonsLoggedInDropdownActions}}
+            {{/if}}
           {{/if}}
         </div>
       {{/if}}
diff --git a/packages/accounts-ui-unstyled/login_buttons_dropdown.js b/packages/accounts-ui-unstyled/login_buttons_dropdown.js
index a21339165f..8177229c48 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dropdown.js
+++ b/packages/accounts-ui-unstyled/login_buttons_dropdown.js
@@ -35,6 +35,10 @@
     return loginButtonsSession.get('inChangePasswordFlow');
   };
 
+  Template.loginButtonsLoggedInDropdown.inMessageOnlyFlow = function () {
+    return loginButtonsSession.get('inMessageOnlyFlow');
+  };
+
   Template.loginButtonsLoggedInDropdown.dropdownVisible = function () {
     return loginButtonsSession.get('dropdownVisible');
   };
@@ -376,6 +380,8 @@
       if (error) {
         loginButtonsSession.set('errorMessage', error.reason || "Unknown error");
       } else {
+        loginButtonsSession.set('inChangePasswordFlow', false);
+        loginButtonsSession.set('inMessageOnlyFlow', true);
         loginButtonsSession.set('infoMessage', "Password changed");
       }
     });
diff --git a/packages/accounts-ui-unstyled/login_buttons_session.js b/packages/accounts-ui-unstyled/login_buttons_session.js
index 7138331cb7..9c4f232330 100644
--- a/packages/accounts-ui-unstyled/login_buttons_session.js
+++ b/packages/accounts-ui-unstyled/login_buttons_session.js
@@ -6,6 +6,7 @@
     'inSignupFlow',
     'inForgotPasswordFlow',
     'inChangePasswordFlow',
+    'inMessageOnlyFlow',
 
     'errorMessage',
     'infoMessage',
@@ -42,6 +43,7 @@
       this.set('inSignupFlow', false);
       this.set('inForgotPasswordFlow', false);
       this.set('inChangePasswordFlow', false);
+      this.set('inMessageOnlyFlow', false);
       this.set('dropdownVisible', false);
       this.resetMessages();
     },