1 files changed, 8 insertions, 12 deletions

diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index 729d4b14d..dd56411f4 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -3,27 +3,20 @@
 
 import $ from 'jquery';
 import ReactDOM from 'react-dom';
-import * as Utils from 'utils/utils.jsx';
-import TeamStore from 'stores/team_store.jsx';
 
 import Constants from 'utils/constants.jsx';
+import * as GlobalActions from 'action_creators/global_actions.jsx';
 
 import {FormattedMessage} from 'react-intl';
 
 import {Link} from 'react-router';
 
-function getStateFromStores() {
-    return {currentTeam: TeamStore.getCurrent()};
-}
-
 import React from 'react';
 
 export default class AdminNavbarDropdown extends React.Component {
     constructor(props) {
         super(props);
         this.blockToggle = false;
-
-        this.state = getStateFromStores();
     }
 
     componentDidMount() {
@@ -64,24 +57,27 @@ export default class AdminNavbarDropdown extends React.Component {
                     >
                         <li>
                             <Link
-                                to={'/' + this.state.currentTeam.name + '/channels/town-square'}
+                                to={'/select_team'}
                             >
                                 <FormattedMessage
                                     id='admin.nav.switch'
                                     defaultMessage='Switch to {display_name}'
                                     values={{
-                                        display_name: this.state.currentTeam.display_name
+                                        display_name: global.window.mm_config.SiteName
                                     }}
                                 />
                             </Link>
                         </li>
                         <li>
-                            <Link to={Utils.getTeamURLFromAddressBar() + '/logout'}>
+                            <a
+                                href='#'
+                                onClick={GlobalActions.emitUserLoggedOutEvent}
+                            >
                                 <FormattedMessage
                                     id='admin.nav.logout'
                                     defaultMessage='Logout'
                                 />
-                            </Link>
+                            </a>
                         </li>
                     </ul>
                 </li>