diff --git a/etemplate/js/et2_widget_entry.js b/etemplate/js/et2_widget_entry.js
index 6c1f313f18..08b3b9abcc 100644
--- a/etemplate/js/et2_widget_entry.js
+++ b/etemplate/js/et2_widget_entry.js
@@ -113,6 +113,12 @@ var et2_entry = et2_valueWidget.extend(
 			type: entry.type || 'label',
 			readonly: this.options.readonly
 		};
+		// Supress labels on templates
+		if(attrs.type == 'template' && this.options.label)
+		{
+			this.egw().debug('log', "Surpressed label on <" + this._type + ' label="' + this.options.label + '" id="' + this.id + '"...>');
+			this.options.label = '';
+		}
 		var widget = et2_createWidget(attrs.type, attrs, this);
 
 		// If value is not set, etemplate takes care of everything