1 files changed, 2 insertions, 5 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx
index b3041ad59..6ab5e80a0 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -137,11 +137,7 @@ function preRenderSetup(callwhendone) {
 function preLoggedIn(nextState, replace, callback) {
     const d1 = Client.getAllPreferences(
         (data) => {
-            if (!data) {
-                return;
-            }
-
-            PreferenceStore.setPreferences(data);
+            PreferenceStore.setPreferencesFromServer(data);
         },
         (err) => {
             AsyncClient.dispatchError(err, 'getAllPreferences');
@@ -197,6 +193,7 @@ function onLoggedOut(nextState) {
             BrowserStore.signalLogout();
             BrowserStore.clear();
             ErrorStore.clearLastError();
+            PreferenceStore.clear();
         },
         () => {
             browserHistory.push('/' + teamName + '/login');