diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
index c8c03652b1cd82a1d766093ddc08fb16c6f4a6ab..df9765c96868e144768cebc5765b12c6ec9bbd9b 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java
@@ -181,6 +181,8 @@ public class CertificatePDFFormWorker {
 		fillField("expenditureOfWorks", expenditureOfWorks, acroForm);
 		String mainLanguage = entry.getMainLanguage();
 		fillField("mainLanguage", mainLanguage, acroForm);
+		String location = entry.getLocation();
+		fillField("location", location, acroForm);
 		
 		if (entry.getLifecycle() != null) {
 			Formatter format = Formatter.getInstance(locale);
diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
index 8c8109750a95d9e47bb90c7b3aeda5e1411943e3..8ac577533dc69b27e0f0f1fd3435d4ed4a932e2e 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java
@@ -20,12 +20,12 @@
 package org.olat.course.certificate.manager;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.io.FileOutputStream;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.Date;
@@ -192,6 +192,8 @@ public class CertificatePdfServiceWorker {
 		context.put("expenditureOfWorks", expenditureOfWorks);
 		String mainLanguage = entry.getMainLanguage();
 		context.put("mainLanguage", mainLanguage);
+		String location = entry.getLocation();
+		context.put("location", location);
 		
 		if (entry.getLifecycle() != null) {
 			Formatter format = Formatter.getInstance(locale);
diff --git a/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java b/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
index 69cebb36e30a9e7676b9ae3d3263dc4c27567d14..f3741b9474fab55c87fe5fbc56e5fcfb70907683 100644
--- a/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
+++ b/src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java
@@ -98,7 +98,7 @@ public class CertificatePhantomWorker {
 		File templateFile = certificatesManager.getTemplateFile(template);
 		File htmlCertificateFile = copyAndEnrichTemplate(templateFile);
 
-		List<String> cmds = new ArrayList<String>();
+		List<String> cmds = new ArrayList<>();
 		cmds.add("phantomjs");
 		cmds.add(certificatesManager.getRasterizePath().toFile().getAbsolutePath());
 		cmds.add(htmlCertificateFile.getAbsolutePath());
@@ -205,6 +205,8 @@ public class CertificatePhantomWorker {
 		context.put("expenditureOfWorks", expenditureOfWorks);
 		String mainLanguage = entry.getMainLanguage();
 		context.put("mainLanguage", mainLanguage);
+		String location = entry.getLocation();
+		context.put("location", location);
 		
 		if (entry.getLifecycle() != null) {
 			Formatter format = Formatter.getInstance(locale);
@@ -271,7 +273,7 @@ public class CertificatePhantomWorker {
 	}
 	
 	public static boolean checkPhantomJSAvailabilty() {
-		List<String> cmds = new ArrayList<String>();
+		List<String> cmds = new ArrayList<>();
 		cmds.add("phantomjs");
 		cmds.add("--help");