Use this.state.routeStack if present

Author: jrichardlai

App/Root.js

@@ -48,7 +48,10 @@ var Root = React.createClass({
   },
 
   onUserChange: function() {
-    this.setState(getUserState());
+    var state = getUserState();
+    // reset the route stack on user change.
+    state.routeStack = null;
+    this.setState(state);
   },
 
   onEnvChange: function() {
@@ -86,7 +89,7 @@ var Root = React.createClass({
   renderContent: function() {
     if (this.state.routeUnderTest) return null;
 
-    var routeStack = Routes.parse(this.getSavedPath(), this.state.user.isLoggedIn(), true);
+    var routeStack = this.state.routeStack || Routes.parse(this.getSavedPath(), this.state.user.isLoggedIn(), true);
 
     if(this.state.user.isLoggedIn()) {
       return (