diff --git a/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java b/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
index 811962c2184d0052527cfbe40dad4eea079ad449..b86e10739aa903a446b96bbff71484c955702d50 100644
--- a/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
+++ b/src/main/java/org/olat/admin/sysinfo/InfoMessageControllerSingleVM.java
@@ -66,11 +66,6 @@ public class InfoMessageControllerSingleVM extends BasicController {
 	@Autowired
 	private CustomStaticFolderManager staticFolderMgr;
 	
-	/**
-	 * 
-	 * @param ureq
-	 * @param control
-	 */
 	public InfoMessageControllerSingleVM(UserRequest ureq, WindowControl control) {
 		super(ureq, control);
 		infoMsgView = createVelocityContainer("infomsg");
@@ -110,10 +105,10 @@ public class InfoMessageControllerSingleVM extends BasicController {
 		// /customizing/static/
 		staticFolderCtrl = new FolderRunController(staticFolderMgr.getRootContainer(), true, ureq, control);
 		listenTo(staticFolderCtrl);
-		infoMsgEdit.put("staticFolder", staticFolderCtrl.getInitialComponent());
+		infoMsgView.put("staticFolder", staticFolderCtrl.getInitialComponent());
 		
 		String url = Settings.getServerContextPathURI() + "/raw/static/";
-		infoMsgEdit.contextPut("extlink", url);
+		infoMsgView.contextPut("extlink", url);
 
 		container = putInitialPanel(infoMsgView);
 	}
diff --git a/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html b/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
index 4d123600e3153b09ccc9c159db283c33a45a9f55..16e657962d3aeebdff520dfd49b73710f02cdd6e 100644
--- a/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
+++ b/src/main/java/org/olat/admin/sysinfo/_content/infomsg.html
@@ -68,4 +68,12 @@
 	</div>
 	</fieldset>
 </div>
-#end
\ No newline at end of file
+#end
+
+#if($r.available("staticFolder"))
+<div class="o_block_large">
+	<legend>$r.translate("staticFolder")</legend>
+	<div class="o_copy_code o_nowrap"><input type="text" value="$extlink" onclick="this.select()"/></div>
+	$r.render("staticFolder")
+</div>
+#end
diff --git a/src/main/java/org/olat/admin/sysinfo/_content/infomsgEdit.html b/src/main/java/org/olat/admin/sysinfo/_content/infomsgEdit.html
index 8073a1fa63acd8f1b1e14feabab9b9fb2f99208d..8b466d128e00c88b70219b435c0a8d0933596d2b 100644
--- a/src/main/java/org/olat/admin/sysinfo/_content/infomsgEdit.html
+++ b/src/main/java/org/olat/admin/sysinfo/_content/infomsgEdit.html
@@ -14,8 +14,4 @@
 		$r.render("maintenanceMsgForm")
 	#end
 #end
-
-<h4>$r.translate("staticFolder")</h4>
-<div class="o_copy_code o_nowrap"><input type="text" value="$extlink" onclick="this.select()"/></div>
-$r.render("staticFolder")
 </fieldset>
\ No newline at end of file