diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py
index deb7225f..64082227 100644
--- a/src/octoprint/server/api/__init__.py
+++ b/src/octoprint/server/api/__init__.py
@@ -204,10 +204,10 @@ def login():
 
 		user = octoprint.server.userManager.findUser(username)
 		if user is not None:
-			if not user.is_active():
-				return make_response(("Your account is deactivated", 403, []))
-
 			if octoprint.server.userManager.checkPassword(username, password):
+				if not user.is_active():
+					return make_response(("Your account is deactivated", 403, []))
+
 				if octoprint.server.userManager.enabled:
 					user = octoprint.server.userManager.login_user(user)
 					session["usersession.id"] = user.session