diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index 3d1b2ec9..17775793 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -217,14 +217,14 @@ export default class BottomBar extends Component {
                 :
                 <ListItem>
                     <ListItemIcon><NumbersIcon/></ListItemIcon>
-                    <ListItemText secondary="Your current order"/>
+                    <ListItemText primary="No active orders" secondary="Your current order"/>
                 </ListItem>
                 }
                 <ListItem>
                     <ListItemIcon>
                         <PasswordIcon/>
                     </ListItemIcon>
-                    <ListItemText secondary="Last generated token.">
+                    <ListItemText secondary="Your token.">
                     {this.props.token ?  
                     <TextField
                         disabled
diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
index 4a42a5c6..7b3b15ce 100644
--- a/frontend/src/components/UserGenPage.js
+++ b/frontend/src/components/UserGenPage.js
@@ -59,10 +59,15 @@ export default class UserGenPage extends Component {
             showRobosat:true,
         })
         &
+        // Add nick and token to App state (token only if not a bad request)
+        (data.bad_request ? this.props.setAppState({
+          nickname: data.nickname,
+        })
+        :
         this.props.setAppState({
           nickname: data.nickname,
           token: this.state.token,
-      });
+      }));
       });
   }