diff --git a/src/main/java/org/olat/course/condition/additionalconditions/PasswordCondition.java b/src/main/java/org/olat/course/condition/additionalconditions/PasswordCondition.java
index dc1481c2cb476138b2e165b778b06f53b8471d59..1e5b0a49e35ed552dba7d54d64a0dd328fa708fb 100644
--- a/src/main/java/org/olat/course/condition/additionalconditions/PasswordCondition.java
+++ b/src/main/java/org/olat/course/condition/additionalconditions/PasswordCondition.java
@@ -54,6 +54,8 @@ public class PasswordCondition extends AdditionalCondition {
 	// <OLATCE-91>
 	@Override
 	public boolean evaluate(Object userAnswerObj) {
+		if(password == null) return true;
+		
 		String userAnswer = null;
 		if(userAnswerObj instanceof IdentityEnvironment) {
 			IdentityEnvironment identityEnv = (IdentityEnvironment)userAnswerObj;
@@ -61,7 +63,7 @@ public class PasswordCondition extends AdditionalCondition {
 		} else if(userAnswerObj instanceof String) {
 			userAnswer = (String)userAnswerObj;
 		}
-		return password == null || password.equals(userAnswer); 
+		return password.equals(userAnswer); 
 	}
 
 	@Override