1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index af2dd559a..24a07a05c 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -172,7 +172,7 @@ public class DataManager implements IdentityManager {
                         version = schema.getVersion();
                     }
 
-                    if (version != 301) {
+                    if (version != 302) {
                         Log.error("Wrong database schema version (" + version + ")");
                         throw new RuntimeException();
                     }
@@ -241,7 +241,11 @@ public class DataManager implements IdentityManager {
         User user = QueryBuilder.create(dataSource, getQuery("database.loginUser"))
                 .setString("email", email)
                 .executeQuerySingle(new User());
-        return user != null && user.isPasswordValid(password) ? user : null;
+        if (user != null && user.isPasswordValid(password)) {
+            return user;
+        } else {
+            return null;
+        }
     }
 
     public Collection<User> getUsers() throws SQLException {