diff --git a/src/main/java/de/kreth/invoice/security/UserManager.java b/src/main/java/de/kreth/invoice/security/UserManager.java
index cde5dd0..cb5ded4 100644
--- a/src/main/java/de/kreth/invoice/security/UserManager.java
+++ b/src/main/java/de/kreth/invoice/security/UserManager.java
@@ -36,7 +36,7 @@ public class UserManager {
 	AccessToken accessToken = getAccessToken();
 	if (accessToken != null) {
 	    User user = userRepository.findByPrincipalId(accessToken.getSubject());
-	    if (hasChanges(user, accessToken)) {
+	    if (user != null && hasChanges(user, accessToken)) {
 		save(user);
 	    }
 	    return user;