diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee
index 3fc495ba..86f36c5f 100644
--- a/assets/scripts/app/auth.coffee
+++ b/assets/scripts/app/auth.coffee
@@ -19,7 +19,7 @@
     global  = Travis.storage.getItem('travis.user')
     session = Travis.sessionStorage.getItem('travis.user')
     user    = session || global
-    if user
+    if @validateUser(user)
       Travis.storage.setItem('travis.user', user) unless global
       data = JSON.parse(user)
       data = { user: data } unless data.user?
@@ -28,6 +28,11 @@
       console.log 'travis.auto_signin', Travis.storage.getItem('travis.auto_signin')
       @signIn()
 
+  validateUser: (user) ->
+    return false unless typeof user == 'string'
+    user = JSON.parse(user)
+    user.id && user.login && user.token
+
   # try signing in, but check later in case we have a timeout
   signIn: () ->
     console.log 'set state, signing-in'