diff --git a/api/etemplate.php b/api/etemplate.php
index 5fb4632f59..ef3f7ad0d1 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -71,7 +71,7 @@ function send_template()
 		}, $str);
 
 		// fix <menulist...><menupopup type="select-*"/></menulist> --> <select type="select-*" .../>
-		$str = preg_replace('#<menulist([^>]*)>[\r\n\s]*<menupopup([^>]+>)[\r\n\s]*</menulist>#', '<select$1$2', $str);
+		$str = preg_replace('#<menulist([^>]*)>[\r\n\s]*(<!--[^>]+-->[\r\n\s]*)?<menupopup([^>]+>)[\r\n\s]*</menulist>#', '$2<select$1$3', $str);
 
 		// fix legacy options, so new client-side has not to deal with them
 		$str = preg_replace_callback('#<([^- />]+)(-[^ ]+)?[^>]* (options="([^"]+)")[ />]#', static function ($matches) {
diff --git a/api/js/etemplate/Et2Dialog/Et2Dialog.ts b/api/js/etemplate/Et2Dialog/Et2Dialog.ts
index 6066d2ada7..1c8e991c6b 100644
--- a/api/js/etemplate/Et2Dialog/Et2Dialog.ts
+++ b/api/js/etemplate/Et2Dialog/Et2Dialog.ts
@@ -524,6 +524,17 @@ export class Et2Dialog extends Et2Widget(ScopedElementsMixin(SlotMixin(LionDialo
 	{
 		let old_template = this.__template;
 		this.__template = new_template_name;
+		// inject preprocessor, if not already in template-url
+		const webserverUrl = this.egw().webserverUrl;
+		if (!new_template_name.match(new RegExp(webserverUrl+'/api/etemplate.php')))
+		{
+			this.__template = new_template_name.replace(new RegExp(webserverUrl), webserverUrl+'/api/etemplate.php');
+		}
+		// if we have no cache-buster, reload daily
+		if (this.__template.indexOf('?') === -1)
+		{
+			this.__template += '?'+((new Date).valueOf()/86400|0).toString();
+		}
 		this.requestUpdate("template", old_template);
 	}
 
@@ -1169,4 +1180,4 @@ customElements.define("et2-dialog", Et2Dialog);
 {
 	window['et2_dialog'] = Et2Dialog;
 	window['Et2Dialog'] = Et2Dialog;
-}
+}
\ No newline at end of file