diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/NewAccountValidator.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/NewAccountValidator.java
index 883d205b8df..792f843b839 100755
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/NewAccountValidator.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/NewAccountValidator.java
@@ -33,7 +33,7 @@ public class NewAccountValidator {
 
     private String validatePasswords(String password, String passwordRepeat) {
         final String result;
-        if (password.length() < MINIMUM_PASSWORD_LENGTH) {
+        if (password == null || password.length() < MINIMUM_PASSWORD_LENGTH) {
             result = stringMessages.passwordMustHaveAtLeastNCharacters(MINIMUM_PASSWORD_LENGTH);
         } else if (!password.equals(passwordRepeat)) {
             result = stringMessages.passwordsDontMatch();
@@ -45,7 +45,7 @@ public class NewAccountValidator {
 
     private String validateUsername(String username) {
         final String result;
-        if (username.length() < MINIMUM_USERNAME_LENGTH) {
+        if (username == null || username.length() < MINIMUM_USERNAME_LENGTH) {
             result = stringMessages.usernameMustHaveAtLeastNCharacters(MINIMUM_USERNAME_LENGTH);
         } else {
             result = null;