1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index b0ae504d0..e620d5334 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -217,11 +217,11 @@ public class PermissionsManager {
 
     public User login(String email, String password) throws SQLException {
         User user = dataManager.login(email, password);
-        if (user != null && users.get(user.getId()) != null) {
+        if (user != null && !user.getDisabled() && (user.getExpirationTime() == null
+                || user.getExpirationTime().getTime() > System.currentTimeMillis())) {
             return users.get(user.getId());
-        } else {
-            return null;
         }
+        return null;
     }
 
 }