diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 0fe5a45ce01d3283879138ff6012b2873e2f3114..cd1bc6719129f05407abae83f453dea18645ca36 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -106,6 +106,9 @@ public class ConfigurationController extends AbstractController {
 
 	@Value("${tracking.site-id}")
 	private String trackingSiteId;
+	
+	@Value("${optional.demoSessionKey:}")
+	private String demoSessionKey;
 
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
@@ -147,6 +150,9 @@ public class ConfigurationController extends AbstractController {
 		if (!"".equals(privacyPolicyUrl)) {
 			config.put("privacyPolicyUrl", privacyPolicyUrl);
 		}
+		if (!"".equals(demoSessionKey)) {
+			config.put("demoSessionKey", demoSessionKey);
+		}
 
 		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
 		config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index e1cbb2293b5645299159484c0afb056e6f1a59a4..c8657b60ba12345c33f6a4e8a742ef107196e634 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -191,6 +191,9 @@ question.answer-option-limit=8
 # effect if neither MathJax nor Markdown are enabled.
 question.parse-answer-option-formatting=false
 
+#optional: demo session keyword to show above session login button
+optional.demoSessionKey=
+
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index e1cbb2293b5645299159484c0afb056e6f1a59a4..c8657b60ba12345c33f6a4e8a742ef107196e634 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -191,6 +191,9 @@ question.answer-option-limit=8
 # effect if neither MathJax nor Markdown are enabled.
 question.parse-answer-option-formatting=false
 
+#optional: demo session keyword to show above session login button
+optional.demoSessionKey=
+
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/