1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index aa24b795e..411b556fc 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -187,11 +187,13 @@ public class User extends Extensible {
     }
 
     public void setToken(String token) {
-        if (token != null && !token.isEmpty()) {
+        if (token != null) {
             if (!token.matches("^[a-zA-Z0-9]{16,}$")) {
                 throw new IllegalArgumentException("Illegal token");
             }
             this.token = token;
+        } else {
+            this.token = null;
         }
     }