diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index 9644a2e7f3..527f979597 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -64,7 +64,7 @@ export default class AdminNavbarDropdown extends React.Component {
                     >
                         <li>
                             <Link
-                                to={Utils.getWindowLocationOrigin() + '/' + this.state.currentTeam.name}
+                                to={Utils.getWindowLocationOrigin() + '/' + this.state.currentTeam.name + '/channels/town-square'}
                             >
                                 <FormattedMessage
                                     id='admin.nav.switch'
diff --git a/webapp/components/login.jsx b/webapp/components/login.jsx
index ad30f0619f..e8180895d9 100644
--- a/webapp/components/login.jsx
+++ b/webapp/components/login.jsx
@@ -29,6 +29,8 @@ export default class Login extends React.Component {
         Client.getMeLoggedIn((data) => {
             if (data && data.logged_in !== 'false') {
                 browserHistory.push('/' + this.props.params.team + '/channels/town-square');
+            } else {
+                this.setState({doneCheckLogin: true}); //eslint-disable-line react/no-did-mount-set-state
             }
         });
     }
@@ -37,7 +39,8 @@ export default class Login extends React.Component {
     }
     getStateFromStores() {
         return {
-            currentTeam: TeamStore.getByName(this.props.params.team)
+            currentTeam: TeamStore.getByName(this.props.params.team),
+            doneCheckLogin: false
         };
     }
     onTeamChange() {
@@ -45,7 +48,7 @@ export default class Login extends React.Component {
     }
     render() {
         const currentTeam = this.state.currentTeam;
-        if (currentTeam == null) {
+        if (currentTeam == null || !this.state.doneCheckLogin) {
             return <div/>;
         }