diff --git a/src/containers/app.js b/src/containers/app.js
index 7768e89..3f8ccff 100644
--- a/src/containers/app.js
+++ b/src/containers/app.js
@@ -97,9 +97,9 @@ class App extends Component {
   componentWillUpdate(nextProps, nextState) {
     // check if user is still logged in
     if (UserStore.getState().token == null) {
-      this.props.router.push('/login');
+      //this.props.router.push('/login');
 
-      return;
+      //return;
     }
 
     // open connection to each required simulator
diff --git a/src/containers/logout.js b/src/containers/logout.js
index cf74720..35078c4 100644
--- a/src/containers/logout.js
+++ b/src/containers/logout.js
@@ -37,7 +37,7 @@ class Home extends Component {
       localStorage.setItem('token', '');
 
       // transition to login page
-      this.props.router.push('/login');
+      nextProps.router.push('/login');
     }
   }
 
diff --git a/src/stores/user-store.js b/src/stores/user-store.js
index b7be604..a256ded 100644
--- a/src/stores/user-store.js
+++ b/src/stores/user-store.js
@@ -35,7 +35,7 @@ class UserStore extends ReduceStore {
 
       case 'users/logout':
         // delete user and token
-        return { token: null, currentUser: null };
+        return Object.assign({}, state, { token: null, currentUser: null });
 
       case 'users/logged-in':
         // request logged-in user data