Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r9853 -r10028
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9853)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10028)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" module="" icon="">
+<inp2:m_DefineElement name="combined_header" permission_type="view" tab_preset="" module="" icon="">
 	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="1"/>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
@@ -16,6 +16,10 @@
 		<inp2:m_include t="$tabs"/>
 	</inp2:m_if>
 
+	<inp2:m_if check="m_Param" name="tab_preset">
+		<inp2:m_RenderElement name="edit_tabs" prefix="$prefix" preset_name="$tab_preset"/>
+	</inp2:m_if>
+
 	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td class="tablenav">
@@ -686,8 +690,8 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="edit_tabs">
-	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="Default">
+<inp2:m_DefineElement name="edit_tabs" preset_name="Default">
+	<inp2:m_if check="{$prefix}_HasEditTabs" preset_name="$preset_name">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
 			<tr>
 				<td align="right" width="100%">
@@ -697,7 +701,7 @@
 								<inp2:m_RenderElement name="tab" title="$title" t="$template" main_prefix="$PrefixSpecial"/>
 							</inp2:m_DefineElement>
 
-							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="Default"/>
+							<inp2:{$prefix}_PrintEditTabs render_as="edit_tab" preset_name="$preset_name"/>
 						</tr>
 					</table>
 				</td>