From 4b556bd3a9602543771c3303162f4e4dff619fcc Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 22 Aug 2016 15:05:15 +0200
Subject: [PATCH] fix password change (#805)

---
 src/main/java/com/commafeed/frontend/resource/UserREST.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/commafeed/frontend/resource/UserREST.java b/src/main/java/com/commafeed/frontend/resource/UserREST.java
index 85a62d97..6143bfca 100644
--- a/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -208,6 +208,7 @@ public class UserREST {
 			return Response.status(Status.FORBIDDEN).build();
 		}
 
+		user = userDAO.findById(user.getId());
 		user.setEmail(StringUtils.trimToNull(request.getEmail()));
 		if (StringUtils.isNotBlank(request.getPassword())) {
 			byte[] password = encryptionService.getEncryptedPassword(request.getPassword(), user.getSalt());