diff --git a/build/actions/auth.js b/build/actions/auth.js
index 1bc909fa..9c09c00c 100644
--- a/build/actions/auth.js
+++ b/build/actions/auth.js
@@ -41,7 +41,14 @@
             type: 'input'
           });
         });
-      }).then(resin.auth.loginWithToken).then(resin.auth.whoami).tap(function(username) {
+      }).then(resin.auth.loginWithToken).then(function(token) {
+        return resin.auth.isLoggedIn().then(function(isLoggedIn) {
+          if (isLoggedIn) {
+            return token;
+          }
+          throw new Error('Authentication failed');
+        });
+      }).then(resin.auth.whoami).tap(function(username) {
         console.info("Successfully logged in as: " + username);
         return events.send('user.login');
       }).nodeify(done);
diff --git a/lib/actions/auth.coffee b/lib/actions/auth.coffee
index 5f20bb9c..c4f37767 100644
--- a/lib/actions/auth.coffee
+++ b/lib/actions/auth.coffee
@@ -48,6 +48,10 @@ exports.login	=
 					type: 'input'
 
 		.then(resin.auth.loginWithToken)
+		.then (token) ->
+			resin.auth.isLoggedIn().then (isLoggedIn) ->
+				return token if isLoggedIn
+				throw new Error('Authentication failed')
 		.then(resin.auth.whoami)
 		.tap (username) ->
 			console.info("Successfully logged in as: #{username}")