6 files changed, 14 insertions, 14 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index d3fc2cd29..5ee1e16a5 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -15,6 +15,8 @@ import SearchStore from 'stores/search_store.jsx';
 import {handleNewPost, loadPosts, loadPostsBefore, loadPostsAfter} from 'actions/post_actions.jsx';
 import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
 import {loadChannelsForCurrentUser} from 'actions/channel_actions.jsx';
+import {stopPeriodicStatusUpdates} from 'actions/status_actions.jsx';
+import * as WebsocketActions from 'actions/websocket_actions.jsx';
 
 import Constants from 'utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
@@ -480,6 +482,8 @@ export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = tr
             UserStore.clear();
             TeamStore.clear();
             newLocalizationSelected(global.window.mm_config.DefaultClientLocale);
+            stopPeriodicStatusUpdates();
+            WebsocketActions.close();
             browserHistory.push(redirectTo);
         },
         () => {
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index d03025efb..9a52eb05c 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -59,7 +59,6 @@ export function initialize() {
 
     WebSocketClient.setEventCallback(handleEvent);
     WebSocketClient.setFirstConnectCallback(handleFirstConnect);
-    WebSocketClient.setReconnectCallback(handleReconnect);
     WebSocketClient.setCloseCallback(handleClose);
     WebSocketClient.initialize(connUrl);
 }
@@ -71,21 +70,18 @@ export function close() {
 export function reconnect() {
     close();
     initialize();
-    handleReconnect();
-}
-
-function handleFirstConnect() {
-    ErrorStore.clearLastError();
-    ErrorStore.emitChange();
-}
 
-function handleReconnect() {
     if (Client.teamId) {
         loadChannelsForCurrentUser();
         loadPosts(ChannelStore.getCurrentId());
+        StatusActions.loadStatusesForChannelAndSidebar();
     }
 
-    StatusActions.loadStatusesForChannelAndSidebar();
+    ErrorStore.clearLastError();
+    ErrorStore.emitChange();
+}
+
+function handleFirstConnect() {
     ErrorStore.clearLastError();
     ErrorStore.emitChange();
 }
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index 07e32e658..d4e144c4f 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -137,7 +137,7 @@ export default class AdminNavbarDropdown extends React.Component {
                         <li>
                             <a
                                 href='#'
-                                onClick={GlobalActions.emitUserLoggedOutEvent}
+                                onClick={() => GlobalActions.emitUserLoggedOutEvent()}
                             >
                                 <FormattedMessage
                                     id='admin.nav.logout'
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index 361c95c49..292c90510 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -203,7 +203,7 @@ export default class SelectTeam extends React.Component {
             headerButton = (
                 <a
                     href='#'
-                    onClick={GlobalActions.emitUserLoggedOutEvent}
+                    onClick={() => GlobalActions.emitUserLoggedOutEvent()}
                 >
                     <span className='fa fa-chevron-left'/>
                     <FormattedMessage id='web.header.logout'/>
diff --git a/webapp/components/sidebar_header_dropdown.jsx b/webapp/components/sidebar_header_dropdown.jsx
index cfa4d2f80..ad0a6e4c6 100644
--- a/webapp/components/sidebar_header_dropdown.jsx
+++ b/webapp/components/sidebar_header_dropdown.jsx
@@ -477,7 +477,7 @@ export default class SidebarHeaderDropdown extends React.Component {
                     <li>
                         <a
                             href='#'
-                            onClick={GlobalActions.emitUserLoggedOutEvent}
+                            onClick={() => GlobalActions.emitUserLoggedOutEvent()}
                         >
                             <FormattedMessage
                                 id='navbar_dropdown.logout'
diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx
index 3b7c1b562..c3c6d0f8f 100644
--- a/webapp/components/sidebar_right_menu.jsx
+++ b/webapp/components/sidebar_right_menu.jsx
@@ -442,7 +442,7 @@ export default class SidebarRightMenu extends React.Component {
                         <li>
                             <a
                                 href='#'
-                                onClick={GlobalActions.emitUserLoggedOutEvent}
+                                onClick={() => GlobalActions.emitUserLoggedOutEvent()}
                             >
                                 <i className='icon fa fa-sign-out'/>
                                 <FormattedMessage