diff --git a/src/main/java/org/olat/course/editor/NodeConfigFormController.java b/src/main/java/org/olat/course/editor/NodeConfigFormController.java
index 8870a98b7270f99f2b53341dfb1de06300fb6863..a595686356850be24e81a8da94e35fdaf2c79ce8 100644
--- a/src/main/java/org/olat/course/editor/NodeConfigFormController.java
+++ b/src/main/java/org/olat/course/editor/NodeConfigFormController.java
@@ -26,7 +26,6 @@ import org.olat.core.gui.components.form.flexible.elements.RichTextElement;
 import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
@@ -181,6 +180,8 @@ public class NodeConfigFormController extends FormBasicController {
 			// the short title is mandatory
 			shortTitle.setErrorKey("nodeConfigForm.menumust", new String[] {});
 			shortTitleOk = false;
+		} else if (shortTitle.hasError()) {
+			shortTitleOk = false;
 		}
 		if (shortTitleOk && super.validateFormLogic(ureq)) {
 			shortTitle.clearError();
diff --git a/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java b/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
index 4db783802afdce8c125514c903b11b5f59c4e8b3..d3221a6dd7cd4b6de757c4f67dd282012e0c2032 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
+++ b/src/main/java/org/olat/repository/RepositoryEntryDetailsFormController.java
@@ -114,19 +114,25 @@ public class RepositoryEntryDetailsFormController extends FormBasicController {
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
 		// Check for empty display name
+		
+		boolean allOk = true;
 		if (!StringHelper.containsNonWhitespace(displayName.getValue())) {
 			displayName.setErrorKey("cif.error.displayname.empty", new String[] {});
-			return false;
+			allOk = false;
+		} else if (displayName.hasError()) {
+			allOk = false;
+		} else {
+			displayName.clearError();
 		}
-		displayName.clearError();
 		// Check for empty description
 		if (!StringHelper.containsNonWhitespace(description.getValue())) {
 			description.setErrorKey("cif.error.description.empty", new String[] {});
-			return false;
+			allOk = false;
+		} else {
+			description.clearError();
 		}
-		description.clearError();
 		// Ok, passed all checks
-		return super.validateFormLogic(ureq);
+		return allOk && super.validateFormLogic(ureq);
 	}
 
 	/**