diff --git a/src/user/users.js b/src/user/users.js
index ef56cfe..1232729 100644
--- a/src/user/users.js
+++ b/src/user/users.js
@@ -41,22 +41,13 @@ class Users extends Component {
   }
 
   static calculateState(prevState, props) {
-    let token = localStorage.getItem("token");
-
-    // If there is a token available and this method was called as a result of loading users
-    if (!prevState && token) {
-      AppDispatcher.dispatch({
-        type: 'users/start-load',
-        token: token
-      });
-    }
 
     if (prevState == null) {
       prevState = {};
     }
 
     return {
-      token: token,
+      token: localStorage.getItem("token"),
       users: UsersStore.getState(),
       scenarios: ScenarioStore.getState(),
       usersToAdd: prevState.usersToAdd || new Map(),
@@ -72,6 +63,19 @@ class Users extends Component {
     };
   }
 
+  componentDidMount() {
+    AppDispatcher.dispatch({
+      type: 'scenarios/start-load',
+      token: this.state.token
+    });
+
+    AppDispatcher.dispatch({
+      type: 'users/start-load',
+      token: this.state.token
+    });
+
+  }
+
   closeNewModal(data) {
     this.setState({ newModal: false });