diff --git a/src/main/java/de/assecutor/votianlt/pages/view/EditAppUserView.java b/src/main/java/de/assecutor/votianlt/pages/view/EditAppUserView.java
index ee40843..957d62b 100644
--- a/src/main/java/de/assecutor/votianlt/pages/view/EditAppUserView.java
+++ b/src/main/java/de/assecutor/votianlt/pages/view/EditAppUserView.java
@@ -267,7 +267,7 @@ public class EditAppUserView extends VerticalLayout implements HasUrlParameter<S
         }
         
         // If both are filled, they must match
-        if (newPasswordFilled && confirmPasswordFilled && !newPassword.equals(confirmPassword)) {
+        if (newPasswordFilled && confirmPasswordFilled && newPassword != null && !newPassword.equals(confirmPassword)) {
             Notification.show("Passwörter stimmen nicht überein", 3000, Notification.Position.MIDDLE);
             return false;
         }