diff --git a/src/main/java/org/olat/registration/DisclaimerController.java b/src/main/java/org/olat/registration/DisclaimerController.java
index 48a3acb170ea1d79c0c979049f86805582eaa765..7166b940761f3b0b3c5d30348fdf2aa4c5df373b 100644
--- a/src/main/java/org/olat/registration/DisclaimerController.java
+++ b/src/main/java/org/olat/registration/DisclaimerController.java
@@ -137,7 +137,7 @@ public class DisclaimerController extends BasicController {
 	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
 		if (source == this.disclaimerFormController) {
-			if (event == event.CANCELLED_EVENT) {
+			if (event == Event.CANCELLED_EVENT) {
 				fireEvent(ureq, Event.CANCELLED_EVENT);
 			} else if (event == Event.DONE_EVENT) {
 				// Verify that, if the additional checkbox is configured to be visible, it is checked as well
diff --git a/src/main/java/org/olat/registration/DisclaimerFormController.java b/src/main/java/org/olat/registration/DisclaimerFormController.java
index dcaa5fed3d6ddb8784f5b7830ba720d1af829773..c8e406a1429da5878331b17e74fbfaa4ee49ac33 100644
--- a/src/main/java/org/olat/registration/DisclaimerFormController.java
+++ b/src/main/java/org/olat/registration/DisclaimerFormController.java
@@ -82,6 +82,7 @@ public class DisclaimerFormController extends FormBasicController {
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		// Add the "accept" checkbox to the form.
 		acceptCheckbox = uifactory.addCheckboxesVertical(ACKNOWLEDGE_CHECKBOX_NAME, null, formLayout, new String[] {DCL_CHECKBOX_KEY}, new String[] {translate(NLS_DISCLAIMER_ACKNOWLEDGED)}, null, 1);
+		acceptCheckbox.setEscapeHtml(false);
 		acceptCheckbox.setMandatory(false);
 		acceptCheckbox.select(DCL_CHECKBOX_KEY, readOnly);
 		
@@ -90,6 +91,7 @@ public class DisclaimerFormController extends FormBasicController {
 			String additionalCheckboxText = translate("disclaimer.additionalcheckbox");
 			if (additionalCheckboxText != null) {
 				additionalCheckbox = uifactory.addCheckboxesVertical(ADDITIONAL_CHECKBOX_NAME, null, formLayout, new String[] {DCL_CHECKBOX_KEY2}, new String[] {additionalCheckboxText}, null, 1);
+				additionalCheckbox.setEscapeHtml(false);
 				additionalCheckbox.select(DCL_CHECKBOX_KEY2, readOnly);
 			}
 		}