diff --git a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
index a4b889c90101116a75c6a3496ab5195c0fec81ee..caedffad0c5b1d4266a99220a0bff653f54bcdd6 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
@@ -194,19 +194,20 @@ public class MSCourseNodeRunController extends BasicController implements Activa
 	private void exposeConfigToVC(UserRequest ureq) {
 		ModuleConfiguration config = courseNode.getModuleConfiguration();
 		myContent.contextPut("hasScoreField", courseNode.hasScoreConfigured());
+		if (courseNode.hasScoreConfigured()) {
+			myContent.contextPut("scoreMin", AssessmentHelper.getRoundedScore(courseNode.getMinScoreConfiguration()));
+			myContent.contextPut("scoreMax", AssessmentHelper.getRoundedScore(courseNode.getMaxScoreConfiguration()));
+		}
 		myContent.contextPut("hasPassedField", courseNode.hasPassedConfigured());
+		if (courseNode.hasPassedConfigured()) {
+			myContent.contextPut("passedCutValue", AssessmentHelper.getRoundedScore(courseNode.getCutValueConfiguration()));
+		}
 		myContent.contextPut("hasCommentField", courseNode.hasCommentConfigured());
 		String infoTextUser = (String) config.get(MSCourseNode.CONFIG_KEY_INFOTEXT_USER);
 		if(StringHelper.containsNonWhitespace(infoTextUser)) {
 				myContent.contextPut(MSCourseNode.CONFIG_KEY_INFOTEXT_USER, infoTextUser);
 				myContent.contextPut("indisclaimer", isPanelOpen(ureq, "disclaimer", true));
 		}
-		myContent.contextPut("passedCutValue", AssessmentHelper.getRoundedScore(courseNode.getCutValueConfiguration()));
-		if (courseNode.hasScoreConfigured()) {
-		myContent.contextPut("scoreMin", AssessmentHelper.getRoundedScore(courseNode.getMinScoreConfiguration()));
-		myContent.contextPut("scoreMax", AssessmentHelper.getRoundedScore(courseNode.getMaxScoreConfiguration()));
-			
-		}
 	}
 	
 	private void exposeUserDataToVC(UserRequest ureq) {