diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateChooserController.java b/src/main/java/org/olat/course/certificate/ui/CertificateChooserController.java
index ff12d20961feb19ad0e9386b0a21e8c4c6bc355e..acf2423c9ce568c2714e496c3cb69b6b9bcb9375 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateChooserController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificateChooserController.java
@@ -101,13 +101,13 @@ public class CertificateChooserController extends UploadCertificateController {
 		fileEl.addActionListener(FormEvent.ONCHANGE);
 		
 		String[] orientationValues = new String[]{
-			translate("portrait"), translate("orientation")
+			translate("portrait"), translate("landscape")
 		};
 		orientationEl = uifactory.addRadiosVertical("orientation", formLayout, orientationKeys, orientationValues);
 		orientationEl.select(orientationKeys[0], true);
 		orientationEl.setVisible(false);
 		
-		formatEl = uifactory.addRadiosVertical("orientation", formLayout, formatKeys, formatKeys);
+		formatEl = uifactory.addRadiosVertical("format", formLayout, formatKeys, formatKeys);
 		formatEl.select(formatKeys[0], true);
 		formatEl.setVisible(false);
 		
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificatesOptionsController.java b/src/main/java/org/olat/course/certificate/ui/CertificatesOptionsController.java
index 605ed22a392eb0d3b38ca01d35dd53e6a00a9c09..6a6474ea2497d3502cda050e4064877e1be832fb 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificatesOptionsController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificatesOptionsController.java
@@ -187,7 +187,6 @@ public class CertificatesOptionsController extends FormBasicController {
 		}
 
 		previewTemplateLink = LinkFactory.createButton("preview", templateCont.getFormItemComponent(), this);
-		previewTemplateLink.setEnabled(hasTemplate);
 		previewTemplateLink.setTarget("preview");
 		
 		boolean reCertificationEnabled = courseConfig.isRecertificationEnabled();