1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/api/security/LoginService.java b/src/main/java/org/traccar/api/security/LoginService.java
index 9938cf6dc..104a6fac3 100644
--- a/src/main/java/org/traccar/api/security/LoginService.java
+++ b/src/main/java/org/traccar/api/security/LoginService.java
@@ -83,12 +83,7 @@ public class LoginService {
         if (user == null) {
             throw new SecurityException("Unknown account");
         }
-        if (user.getDisabled()) {
-            throw new SecurityException("Account is disabled");
-        }
-        if (user.getExpirationTime() != null && System.currentTimeMillis() > user.getExpirationTime().getTime()) {
-            throw new SecurityException("Account has expired");
-        }
+        user.checkDisabled();
     }
 
 }