diff --git a/src/main/java/com/commafeed/backend/service/UserService.java b/src/main/java/com/commafeed/backend/service/UserService.java
index 25112bd8..980a81a5 100644
--- a/src/main/java/com/commafeed/backend/service/UserService.java
+++ b/src/main/java/com/commafeed/backend/service/UserService.java
@@ -116,10 +116,10 @@ public class UserService {
 		user.setCreated(new Date());
 		user.setSalt(salt);
 		user.setPassword(encryptionService.getEncryptedPassword(password, salt));
+		userDAO.saveOrUpdate(user);
 		for (Role role : roles) {
 			userRoleDAO.saveOrUpdate(new UserRole(user, role));
 		}
-		userDAO.saveOrUpdate(user);
 		return user;
 	}