diff --git a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
index 62c0db22bb49f81c7614572c62b9321448fa3698..dc9bcbc2fba38bf605d56e25e52f760ca4e73888 100644
--- a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
+++ b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
@@ -28,9 +28,11 @@
 */
 package de.bps.onyx.plugin.course.nodes.iq;
 
+import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Scanner;
 
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
@@ -208,6 +210,7 @@ public class IQEditForm extends FormBasicController {
 		//Surveys do not have a solution
 		if(!isSurvey){
 			allowShowSolutionBox = uifactory.addCheckboxesVertical("allowShowSolution", "qti.form.allowShowSolution", formLayout, allowShowSolution, valuesShowSolution, null, 1);
+			allowShowSolutionBox.addActionListener(this, FormEvent.ONCLICK);
 			if(confAllowShowSolution!=null){
 				allowShowSolutionBox.select(ALLOW, confAllowShowSolution);
 			} else if (isSelfTest){
@@ -221,6 +224,7 @@ public class IQEditForm extends FormBasicController {
 		String[] valuesSuspesion = new String[] { "" };
 		allowSuspensionBox = uifactory.addCheckboxesVertical("allowSuspension", "qti.form.allowSuspension", formLayout, allowSuspension,
 				valuesSuspesion, null, 1);
+		allowSuspensionBox.addActionListener(this, FormEvent.ONCLICK);
 		if (confAllowSuspension != null) {
 			allowSuspensionBox.select(ALLOW, confAllowSuspension);
 		} else if (isSelfTest) {
@@ -474,13 +478,21 @@ public class IQEditForm extends FormBasicController {
 	/**
 	 * @return Returns the points needes to pass an onyx test.
 	 */
-	public Integer getCutValue() {
-		final Scanner cutValueScanner = new Scanner(cutValue.getValue());
-		if (cutValueScanner.hasNextInt()) {
-			return new Integer(cutValueScanner.nextInt());
-		} else {
-			return null;
+	public Float getCutValue() {
+		String val = cutValue.getValue();
+		Float f = Float.NaN;
+		try {
+			f = Float.valueOf(val);
+		} catch (Exception e) {
+			try {
+				NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
+				f = Float.valueOf(nf.parse(val).floatValue());
+			} catch (ParseException e1) {
+				//ooops
+			}
 		}
+		cutValue.setValue(f.toString());
+		return f;
 	}
 
 	/**
diff --git a/src/main/java/org/olat/course/nodes/iq/IQEditController.java b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
index 19342beb76a7b6465fef5ba343f3777e31fa31f0..4190eb6f7eaae4aadda946b0cf12debfde85836d 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQEditController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
@@ -630,15 +630,10 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
 	}
 	
 	private void doModOnyxConfigForm(IQEditForm modConfigForm) {
-		String qtiType = null;
-		if (moduleConfiguration.get(IQEditController.CONFIG_KEY_TYPE_QTI) != null) {
-			qtiType = (String) moduleConfiguration.get(IQEditController.CONFIG_KEY_TYPE_QTI);
-		}
-	
 		moduleConfiguration.set(CONFIG_KEY_TEMPLATE, modConfigForm.getTemplate());
 		if (!(type.equals(AssessmentInstance.QMD_ENTRY_TYPE_SURVEY))) {
 			moduleConfiguration.set(CONFIG_KEY_ATTEMPTS, modConfigForm.getAttempts());
-			moduleConfiguration.set(CONFIG_KEY_CUTVALUE, modConfigForm.getCutValue() != null ? Float.parseFloat("" + modConfigForm.getCutValue()) : null);
+			moduleConfiguration.set(CONFIG_KEY_CUTVALUE, modConfigForm.getCutValue());
 		}
 		moduleConfiguration.set(CONFIG_KEY_DATE_DEPENDENT_RESULTS, new Boolean(modConfigForm.isShowResultsDateDependent()));
 		moduleConfiguration.set(CONFIG_KEY_RESULTS_START_DATE, modConfigForm.getShowResultsStartDate());