diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a8c744982..011a23ce4 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2357,9 +2357,9 @@ define([
             var myData = metadataMgr.getUserData();
             var privateData = metadataMgr.getPrivateData();
             var uid = myData.uid;
-            if (!priv.plan && privateData.plan) {
+            if ((!priv.plan && privateData.plan) ||
+                (!priv.accountName && privateData.accountName)) {
                 config.$initBlock.empty();
-                metadataMgr.off('change', updateButton);
                 UIElements.createUserAdminMenu(Common, config);
                 return;
             }