diff --git a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
index 2a2e2d0fc7..5466e86244 100644
--- a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
+++ b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
@@ -225,7 +225,7 @@ public final class CreateAdministrator {
 
                     if (s != null) {
                         s = s.trim();
-                        if (s.toLowerCase().startsWith("y") && password != null) {
+                        if (s.toLowerCase().startsWith("y")) {
                             dataOK = true;
                         }
                     }