diff --git a/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java b/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
index 861bf8beb8f7c7e635b139c96703b1f120aa0f89..26427307a711bf7331e7cc0142de12b922b36527 100644
--- a/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
+++ b/src/main/java/org/olat/repository/ui/author/CreateRepositoryEntryController.java
@@ -128,13 +128,12 @@ public class CreateRepositoryEntryController extends FormBasicController {
 	protected boolean validateFormLogic(UserRequest ureq) {
 		boolean allOk = true;
 		
+		displaynameEl.clearError();
 		if (!StringHelper.containsNonWhitespace(displaynameEl.getValue())) {
 			displaynameEl.setErrorKey("cif.error.displayname.empty", new String[] {});
-			allOk = false;
+			allOk &= false;
 		} else if (displaynameEl.hasError()) {
-			allOk = false;
-		} else {
-			displaynameEl.clearError();
+			allOk &= false;
 		}
 		
 		return allOk & super.validateFormLogic(ureq);