diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js
index 3ec9f1d667..7c855af3a3 100644
--- a/frontend/src/components/common/account.js
+++ b/frontend/src/components/common/account.js
@@ -92,16 +92,20 @@ class Account extends Component {
   }
 
   renderMenu = () => {
-    if (this.state.isStaff && !this.props.isAdminPanel) {
-      return (
-        <a href={siteRoot + 'sys/useradmin/'} title={gettext('System Admin')} className="item">{gettext('System Admin')}</a>
-      );
-    }
-    if (this.props.isAdminPanel) {
+    let isAdminPage = this.state.isStaff || this.state.isOrgStaff;
+
+    if (isAdminPage && this.props.isAdminPanel) {
       return (
         <a href={siteRoot} title={gettext('Exit Admin Panel')} className="item">{gettext('Exit Admin Panel')}</a>
       );
     }
+
+    if (this.state.isStaff) {
+      return (
+        <a href={siteRoot + 'sys/useradmin/'} title={gettext('System Admin')} className="item">{gettext('System Admin')}</a>
+      );
+    }
+
     if (this.state.isOrgStaff) {
       return (
         <a href={siteRoot + 'org/useradmin/'} title={gettext('Organization Admin')} className="item">{gettext('Organization Admin')}</a>
@@ -153,6 +157,10 @@ class Account extends Component {
   }
 }
 
+Account.defaultProps = {
+  isAdminPanel: false
+}
+
 Account.propTypes = propTypes;
 
 export default Account;
diff --git a/frontend/src/pages/org-admin/main-panel.js b/frontend/src/pages/org-admin/main-panel.js
index 0422eed4b2..d86d8961a7 100644
--- a/frontend/src/pages/org-admin/main-panel.js
+++ b/frontend/src/pages/org-admin/main-panel.js
@@ -48,7 +48,7 @@ class MainPanel extends Component {
             </div>
           </div>
           <div className="common-toolbar">
-            <Account />
+            <Account isAdminPanel={true}/>
           </div>
         </div>
         {this.props.children}