Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r4115 -r4411
--- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 4115)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 4411)
@@ -1,9 +1,9 @@
 <inp2:m_DefineElement name="config_edit_text">
-	<input type="text" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />" />
+	<input type="text" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_password">
-	<input type="password" primarytype="password" name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>" value="" />
+	<input type="password" tabindex="<inp2:m_get param="tab_index"/>" primarytype="password" name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>" value="" />
 	<input type="password" name="verify_<inp2:InputName field="$field"/>" id="verify_<inp2:InputName field="$field"/>" value="" />
 	&nbsp;<span class="error" id="error_<inp2:InputName field="$field"/>"></span>
 </inp2:m_DefineElement>
@@ -13,29 +13,30 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
-	<select name="<inp2:InputName field="$field"/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+	<select name="<inp2:InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>">
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="config_edit_checkbox">
+<inp2:m_DefineElement name="config_edit_checkbox" field_class="">
 	<input type="hidden" id="<inp2:InputName field="$field"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" db="db"/>">
 	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:InputName field="$field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:InputName field="$field"/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
-	<textarea name="<inp2:InputName field="$field"/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+	<textarea tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_radio_item">
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block">
+	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="3">
@@ -58,6 +59,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block1">
+	<inp2:m_inc param="tab_index" by="1"/>
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="3">