diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java
index 23c8080471..9baa696027 100644
--- a/Mage.Server/src/main/java/mage/server/Session.java
+++ b/Mage.Server/src/main/java/mage/server/Session.java
@@ -185,9 +185,15 @@ public class Session {
         AuthorizedUser authorizedUser = null;
         if (ConfigSettings.getInstance().isAuthenticationActivated()) {
             authorizedUser = AuthorizedUserRepository.instance.getByName(userName);
-            if (authorizedUser == null || !authorizedUser.doCredentialsMatch(userName, password)) {
-                return "Wrong username or password. In case you haven't, please register your account first.";
+            String errorMsg = "Wrong username or password. In case you haven't, please register your account first.";
+            if (authorizedUser == null) {
+                return errorMsg;
             }
+
+            if (!Main.isTestMode() && !authorizedUser.doCredentialsMatch(userName, password)) {
+                return errorMsg;
+            }
+
             if (!authorizedUser.active) {
                 return "Your profile is deactivated, you can't sign on.";
             }