diff --git a/src/api.js b/src/api.js
index 301224d27..59a4f5ed8 100644
--- a/src/api.js
+++ b/src/api.js
@@ -203,12 +203,7 @@ Api.fn.session = {
 		}
 
 		var user = $waitPromise(this.xo.users.first({'email': p_email}));
-		if (!user)
-		{
-			throw Api.err.INVALID_CREDENTIAL;
-		}
-
-		if (!user.checkPassword(p_pass))
+		if (!(user && user.checkPassword(p_pass)))
 		{
 			throw Api.err.INVALID_CREDENTIAL;
 		}