diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm
index 156137eeba..d766464bd1 100644
--- a/libs/cbi/luasrc/view/cbi/nsection.htm
+++ b/libs/cbi/luasrc/view/cbi/nsection.htm
@@ -32,6 +32,7 @@ $Id$
 		<br />
 	</fieldset>
 <% elseif self.addremove then %>
+	<% if self.template_addremove then include(self.template_addremove) else -%>
 	<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
 		<% if self.title and #self.title > 0 then -%>
 			<legend><%=self.title%></legend>
@@ -39,5 +40,6 @@ $Id$
 		<div class="cbi-section-descr"><%=self.description%></div>
 		<input type="submit" class="cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add%>" />
 	</fieldset>
+	<%- end %>
 <% end %>
 <!-- /nsection -->
diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index b0da0813d3..af62c53ba1 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -107,18 +107,20 @@ end
 		<% end %>
 
 		<%- if self.addremove then -%>
-		<div class="cbi-section-create">
-			<% if self.anonymous then %>
-				<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
-			<% else %>
-				<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
-				<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-				<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
-				<% if self.invalid_cts then -%>
-					<br /><%:cbi_invalid%></div>
-				<%- end %>
-			<% end %>
-		</div>
+			<% if self.template_addremove then include(self.template_addremove) else -%>
+			<div class="cbi-section-create">
+				<% if self.anonymous then %>
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
+				<% else %>
+					<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
+					<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
+					<% if self.invalid_cts then -%>
+						<br /><%:cbi_invalid%></div>
+					<%- end %>
+				<% end %>
+			</div>
+			<%- end %>
 		<%- end -%>
 	</div>
 </fieldset>
diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm
index 70c44aaf6b..db723f92aa 100644
--- a/libs/cbi/luasrc/view/cbi/tsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tsection.htm
@@ -41,6 +41,7 @@ $Id$
 	<%- end %>
 
 	<% if self.addremove then -%>
+		<% if self.template_addremove then include(self.template_addremove) else -%>
 		<div class="cbi-section-create">
 			<% if self.anonymous then -%>
 				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add%>" />
@@ -53,5 +54,6 @@ $Id$
 				<%- end %>
 			<%- end %>
 		</div>
+		<%- end %>
 	<%- end %>
 </fieldset>