diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21AdminController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21AdminController.java
index 91528cae748c037d313ce77549865091433a896b..7f5f951d1593ccaa34ad45871b3f3134082336dc 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21AdminController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21AdminController.java
@@ -90,12 +90,15 @@ public class QTI21AdminController extends FormBasicController {
 			createQTI12resourcesEl.select(onKeys[0], true);
 		}
 		
-		validationButton = uifactory.addFormLink("validate.xml.signature", formLayout, Link.BUTTON);
 		
 		FormLayoutContainer layoutCont = FormLayoutContainer.createDefaultFormLayout("options", getTranslator());
 		layoutCont.setRootForm(mainForm);
 		formLayout.add("options", layoutCont);
 		layoutCont.setFormTitle(translate("admin.title"));
+
+		validationButton = uifactory.addFormLink("validate.xml.signature", layoutCont, Link.BUTTON);
+		validationButton.setCustomEnabledLinkCSS("btn btn-default pull-right");
+		validationButton.getComponent().setSuppressDirtyFormWarning(true);
 		
 		digitalSignatureEl = uifactory.addCheckboxesHorizontal("digital.signature", "digital.signature", layoutCont,
 				onKeys, onValues);
@@ -183,6 +186,13 @@ public class QTI21AdminController extends FormBasicController {
 		
 		return allOk;
 	}
+	
+	@Override
+	protected void propagateDirtinessToContainer(FormItem source, FormEvent fe) {
+		if(source != this.validationButton) {
+			super.propagateDirtinessToContainer(source, fe);
+		}
+	}
 
 	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
diff --git a/src/main/java/org/olat/ims/qti21/ui/_content/admin.html b/src/main/java/org/olat/ims/qti21/ui/_content/admin.html
index 704fae8ecb085ba8a9dc23d8eca4b90d012da113..f8552ac9a2e455e9d4412fa55be8c22f0debcb9e 100644
--- a/src/main/java/org/olat/ims/qti21/ui/_content/admin.html
+++ b/src/main/java/org/olat/ims/qti21/ui/_content/admin.html
@@ -1,5 +1,2 @@
 $r.render("optionsFor12")
-<div class="o_button_group o_button_group_right">
-$r.render("validate.xml.signature")
-</div>
 $r.render("options")
\ No newline at end of file