diff --git a/app/components/routes/login.js b/app/components/routes/login.js
index c258b49..cb0aca3 100644
--- a/app/components/routes/login.js
+++ b/app/components/routes/login.js
@@ -170,9 +170,15 @@ export default class Login extends React.Component {
       toValue: 0,
       tension: 30,
     }).start();
-    if (token.get()) {
-      this.proceed();
-    }
+
+    token.get().then(function (CIToken) {
+      if (!CIToken) {
+        return;
+      }
+      checkToken(CIToken).then(function (isValid) {
+        this.proceed();
+      }.bind(this));
+    }.bind(this));
   }
 
   render() {