1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/api/resource/PasswordResource.java b/src/main/java/org/traccar/api/resource/PasswordResource.java
index 643471797..91c2d8ecf 100644
--- a/src/main/java/org/traccar/api/resource/PasswordResource.java
+++ b/src/main/java/org/traccar/api/resource/PasswordResource.java
@@ -16,7 +16,7 @@
 package org.traccar.api.resource;
 
 import org.traccar.api.BaseResource;
-import org.traccar.database.MailManager;
+import org.traccar.mail.MailManager;
 import org.traccar.model.User;
 import org.traccar.notification.TextTemplateFormatter;
 import org.traccar.storage.StorageException;
@@ -58,7 +58,8 @@ public class PasswordResource extends BaseResource {
         if (user != null) {
             String token = UUID.randomUUID().toString().replaceAll("-", "");
             user.set(PASSWORD_RESET_TOKEN, token);
-            storage.updateObject(user, new Request(new Columns.Exclude("id"), new Condition.Equals("id", "id")));
+            storage.updateObject(user, new Request(
+                    new Columns.Include("attributes"), new Condition.Equals("id", "id")));
 
             var velocityContext = textTemplateFormatter.prepareContext(permissionsService.getServer(), user);
             velocityContext.put("token", token);
@@ -79,7 +80,8 @@ public class PasswordResource extends BaseResource {
         if (user != null) {
             user.getAttributes().remove(PASSWORD_RESET_TOKEN);
             user.setPassword(password);
-            storage.updateObject(user, new Request(new Columns.Exclude("id"), new Condition.Equals("id", "id")));
+            storage.updateObject(user, new Request(
+                    new Columns.Include("attributes", "hashedPassword", "salt"), new Condition.Equals("id", "id")));
             return Response.ok().build();
         }
         return Response.status(Response.Status.NOT_FOUND).build();