diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
index b73c3ffe0..ddd556ec4 100644
--- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -27,12 +27,28 @@
 {extends file="helpers/form/form.tpl"}
 
 {block name="label"}
+	{if $input.name == 'vat_number'}
+		{if $vat == 'is_applicable'}
+			<div id="vat_area" style="display: visible">
+		{else if $vat == 'management'}
+			<div id="vat_area" style="display: hidden">
+		{else}
+			<div style="display: none;">
+		{/if}
+	{else if $input.name == 'id_state'}
+		<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
+	{/if}
+
+	{if $input.type == 'text_customer' && !isset($customer)}
+		<label>{l s='Customer e-mail'}</label>
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
-{block name="start_field_block"}
+{block name="field_block"}
 	{if $input.type == 'text_customer'}
 		{if isset($customer)}
-			<label>{$input.label}</label>
 			<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
 			<input type="hidden" name="id_customer" value="{$customer->id}" />
 			<input type="hidden" name="email" value="{$customer->email}" />
@@ -71,34 +87,13 @@
 				}
 			});
 			</script>
-			<label>{l s='Customer e-mail'}</label>
 			<div class="margin-form">
 				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
 			</div>
 		{/if}
-	{else} 
-		{if $input.name == 'vat_number'}		
-			{if $vat == 'is_applicable'}
-				<div id="vat_area" style="display: visible">
-			{else if $vat == 'management'}
-				<div id="vat_area" style="display: hidden">
-			{else}
-				<div style="display: none;">
-			{/if}
-		{else if $input.name == 'id_state'}
-				<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-		{/if}
-		<label>{$input.label} </label>
-		<div class="margin-form">
+	{else}
+		{$smarty.block.parent}
 	{/if}
-{/block}
-
-{block name="end_field_block"}
-	{* close div margin-form *}
-	{if $input.type != 'text_customer'}
-		</div>
-	{/if}
-	{* close hidden div *}
 	{if $input.name == 'vat_number' || $input.name == 'id_state'}
 		</div>
 	{/if}
diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
index 4f2af17cf..cb479207a 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -30,31 +30,24 @@
 	{if $input.type == 'color'}
 		<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
 	{/if}
-	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
+	{$smarty.block.parent}
 {/block}
 
-
-{block name="start_field_block"}
-	<div class="margin-form">
-		{if $input.name == 'current_texture'}
+{block name="field_block"}
+	{if $input.name == 'current_texture'}
+		<div class="margin-form">
 			{if isset($imageTextureExists) && $imageTextureExists}
 				<img src="{$imageTexture}" alt="{l s='Texture'}" />
 			{else}
 				{l s='None'}
 			{/if}
-		{/if}
-{/block}
-
-{block name="end_field_block"}
-		{if $input.type == 'text' && $input.name == 'texture'}
-			</div>
-		{/if}
-	</div>
-		{if $input.name == 'name'}
-			{hook h="displayAttributeForm" id_attribute=$form_id}
-		{/if}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}
+	{if $input.name == 'name'}
+		{hook h="displayAttributeForm" id_attribute=$form_id}
+	{/if}
 {/block}
 
 {block name="script"}
@@ -71,5 +64,4 @@
 	displayColorFieldsOption();
 	
 	$('#id_attribute_group').change(displayColorFieldsOption);
-	
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
index e518b11ea..f7850e858 100644
--- a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
@@ -66,12 +66,13 @@
 	</div>
 {/block}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input_block"}
 	{if $input.type == 'select_category'}
 		<select name="{$input.name}">
 			{$input.options.html}
 		</select>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
diff --git a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
index b13bd9d98..44338b070 100644
--- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
@@ -26,12 +26,13 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input_block"}
 	{if $input.type == 'select_category'}
 		<select name="id_parent">
 			{$input.options.html}
 		</select>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
index 5258a3787..397cb965e 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
@@ -25,9 +25,9 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="start_field_block"}
-	<div class="margin-form">
-		{if $input.type == 'address_layout'}
+{block name="field_block"}
+	{if $input.type == 'address_layout'}
+		<div class="margin-form">
 			<div style="float:left">
 				<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
 			</div>
@@ -46,7 +46,10 @@
 					{l s='Clean layout'}</a>
 				<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
 			</div>
-		{/if}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
 {block name=script}
diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
index 481316424..a6e863bd4 100644
--- a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
@@ -25,8 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input_block"}
 	{if $input.type == 'select_theme'}
 		<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
 			{foreach $input.options.query AS $option}
@@ -42,7 +41,8 @@
 				>{$option|escape:'htmlall':'UTF-8'}</option>
 			{/foreach}
 		</select>
-		{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
index 3fe9a236d..c5c24c0e8 100644
--- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
@@ -43,7 +43,7 @@
 {/block}
 
 
-{block name="start_field_block"}
+{block name="field_block"}
 	{if $input['type'] == 'group_discount_category'}
 	<div style="{if !$form_id}display:none{/if}">
 		<script type="text/javascript">
@@ -269,6 +269,6 @@
 			</table>
 	</div>
 	{else}
-		<div class="margin-form">
+		{$smarty.block.parent}
 	{/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
index 10a5f659a..01e2133a6 100644
--- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
@@ -61,24 +61,25 @@
 
 {/block}
 
-{block name="start_field_block"}
-	<div class="margin-form">
-		{if $input.type == 'checkboxStatuses'}
-			{foreach $input.values.query as $value}
-				{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
-				<input type="checkbox"
-					name="{$input.name}[]"
-					id="{$id_checkbox}"
-					value="{$value[$input.values.id]|intval}"
-					{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
-				<label for="{$id_checkbox}"
-					style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
-						<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
-						{$value[$input.values.name]}
-						({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
-				</label><br />
-			{/foreach}
-		{/if}
+{block name="input_block"}
+	{if $input.type == 'checkboxStatuses'}
+		{foreach $input.values.query as $value}
+			{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
+			<input type="checkbox"
+				name="{$input.name}[]"
+				id="{$id_checkbox}"
+				value="{$value[$input.values.id]|intval}"
+				{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
+			<label for="{$id_checkbox}"
+				style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
+					<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
+					{$value[$input.values.name]}
+					({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
+			</label><br />
+		{/foreach}
+	{else}
+		{$smarty.block.parent}
+	{/if}
 {/block}
 
 {block name="after"}<div style="clear:both">&nbsp;</div>{/block}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index d273366eb..f52ee8ed3 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -58,295 +58,299 @@
 					<p class="description">{$field}</p>
 				{elseif $key == 'input'}
 					{foreach $field as $input}
-						{if $input.name == 'id_state'}
-							<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-						{/if}
-						{block name="label"}
-							{if isset($input.label)}<label>{$input.label} </label>{/if}
-						{/block}
 						{if $input.type == 'hidden'}
 							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 						{else}
-						{block name="start_field_block"}
-							<div class="margin-form">
-						{/block}
-							{if $input.type == 'text' || $input.type == 'tags'}
-								{if isset($input.lang)}
-									<div class="translatable">
-										{foreach $languages as $language}
-											<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-												{if $input.type == 'tags'}
-													{literal}
-													<script type="text/javascript">
-														$().ready(function () {
-															var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
-															$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
-															$({/literal}'#{$table}{literal}_form').submit( function() {
-																$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
-														    });
-														});
-													</script>
-													{/literal}
-												{/if}
-                                                {assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
-												<input type="text"
-														name="{$input.name}_{$language.id_lang}"
-														id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
-														value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
-														class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-														{if isset($input.size)}size="{$input.size}"{/if}
-														{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-														{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-														{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
-														{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
-												{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-											</div>
-										{/foreach}
-									</div>
-								{else}
-									{if $input.type == 'tags'}
-										{literal}
-										<script type="text/javascript">
-											$().ready(function () {
-												var input_id = '{/literal}{if isset($input.id)}{$input.id}{else}{$input.name}{/if}{literal}';
-												$('#'+input_id).tagify();
-												$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
-												$({/literal}'#{$table}{literal}_form').submit( function() {
-													$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
-											    });
-											});
-										</script>
-										{/literal}
-									{/if}
-                                    {assign var='value_text' value=$fields_value[$input.name]}
-									<input type="text"
-											name="{$input.name}"
-											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
-											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
-											class="{if $input.type == 'tags'}tagify {/if}"
-											{if isset($input.size)}size="{$input.size}"{/if}
-											{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-											{if isset($input.class)}class="{$input.class}"{/if}
-											{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-											{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
-											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
-									{if isset($input.suffix)}{$input.suffix}{/if}
-									{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-								{/if}
-							{elseif $input.type == 'select'}
-								{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
-									{$input.empty_message}
-									{$input.required = false}
-									{$input.desc = null}
-								{else}
-									<select name="{$input.name}" class=""
-											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
-											{if isset($input.multiple)}multiple="multiple" {/if}
-											{if isset($input.size)}size="{$input.size}"{/if}
-											{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
-										{if isset($input.options.default)}
-											<option value="{$input.options.default.value}">{$input.options.default.label}</option>
+							{if $input.name == 'id_state'}
+								<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
+							{/if}
+							{block name="label"}
+								{if isset($input.label)}<label>{$input.label} </label>{/if}
+							{/block}
+							{block name="field_block"}
+								{block name="start_field_block"}
+									<div class="margin-form">
+								{/block}
+								{block name="input_block"}
+								{if $input.type == 'text' || $input.type == 'tags'}
+									{if isset($input.lang)}
+										<div class="translatable">
+											{foreach $languages as $language}
+												<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
+													{if $input.type == 'tags'}
+														{literal}
+														<script type="text/javascript">
+															$().ready(function () {
+																var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
+																$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
+																$({/literal}'#{$table}{literal}_form').submit( function() {
+																	$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+																});
+															});
+														</script>
+														{/literal}
+													{/if}
+													{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
+													<input type="text"
+															name="{$input.name}_{$language.id_lang}"
+															id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
+															value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+															class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
+															{if isset($input.size)}size="{$input.size}"{/if}
+															{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
+															{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
+															{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
+															{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
+													{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+												</div>
+											{/foreach}
+										</div>
+									{else}
+										{if $input.type == 'tags'}
+											{literal}
+											<script type="text/javascript">
+												$().ready(function () {
+													var input_id = '{/literal}{if isset($input.id)}{$input.id}{else}{$input.name}{/if}{literal}';
+													$('#'+input_id).tagify();
+													$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
+													$({/literal}'#{$table}{literal}_form').submit( function() {
+														$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+													});
+												});
+											</script>
+											{/literal}
 										{/if}
-										{if isset($input.options.optiongroup)}
-											{foreach $input.options.optiongroup.query AS $optiongroup}
-												<optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
-													{foreach $optiongroup[$input.options.options.query] as $option}
-														<option value="{$option[$input.options.options.id]}"
+										{assign var='value_text' value=$fields_value[$input.name]}
+										<input type="text"
+												name="{$input.name}"
+												id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
+												value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+												class="{if $input.type == 'tags'}tagify {/if}"
+												{if isset($input.size)}size="{$input.size}"{/if}
+												{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
+												{if isset($input.class)}class="{$input.class}"{/if}
+												{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
+												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
+												{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
+										{if isset($input.suffix)}{$input.suffix}{/if}
+										{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+									{/if}
+								{elseif $input.type == 'select'}
+									{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
+										{$input.empty_message}
+										{$input.required = false}
+										{$input.desc = null}
+									{else}
+										<select name="{$input.name}" class=""
+												id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
+												{if isset($input.multiple)}multiple="multiple" {/if}
+												{if isset($input.size)}size="{$input.size}"{/if}
+												{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
+											{if isset($input.options.default)}
+												<option value="{$input.options.default.value}">{$input.options.default.label}</option>
+											{/if}
+											{if isset($input.options.optiongroup)}
+												{foreach $input.options.optiongroup.query AS $optiongroup}
+													<optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
+														{foreach $optiongroup[$input.options.options.query] as $option}
+															<option value="{$option[$input.options.options.id]}"
+																{if isset($input.multiple)}
+																	{foreach $fields_value[$input.name] as $field_value}
+																		{if $field_value == $option[$input.options.options.id]}selected="selected"{/if}
+																	{/foreach}
+																{else}
+																	{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}
+																{/if}
+															>{$option[$input.options.options.name]}</option>
+														{/foreach}
+													</optgroup>
+												{/foreach}
+											{else}
+												{foreach $input.options.query AS $option}
+													{if is_object($option)}
+														<option value="{$option->$input.options.id}"
 															{if isset($input.multiple)}
 																{foreach $fields_value[$input.name] as $field_value}
-																	{if $field_value == $option[$input.options.options.id]}selected="selected"{/if}
+																	{if $field_value == $option->$input.options.id}
+																		selected="selected"
+																	{/if}
 																{/foreach}
 															{else}
-																{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}
-															{/if}
-														>{$option[$input.options.options.name]}</option>
-													{/foreach}
-												</optgroup>
-											{/foreach}
-										{else}
-											{foreach $input.options.query AS $option}
-												{if is_object($option)}
-													<option value="{$option->$input.options.id}"
-														{if isset($input.multiple)}
-															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option->$input.options.id}
+																{if $fields_value[$input.name] == $option->$input.options.id}
 																	selected="selected"
 																{/if}
-															{/foreach}
-														{else}
-															{if $fields_value[$input.name] == $option->$input.options.id}
-																selected="selected"
 															{/if}
-														{/if}
-													>{$option->$input.options.name}</option>
-												{else}
-													<option value="{$option[$input.options.id]}"
-														{if isset($input.multiple)}
-															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option[$input.options.id]}
+														>{$option->$input.options.name}</option>
+													{else}
+														<option value="{$option[$input.options.id]}"
+															{if isset($input.multiple)}
+																{foreach $fields_value[$input.name] as $field_value}
+																	{if $field_value == $option[$input.options.id]}
+																		selected="selected"
+																	{/if}
+																{/foreach}
+															{else}
+																{if $fields_value[$input.name] == $option[$input.options.id]}
 																	selected="selected"
 																{/if}
-															{/foreach}
-														{else}
-															{if $fields_value[$input.name] == $option[$input.options.id]}
-																selected="selected"
 															{/if}
-														{/if}
-													>{$option[$input.options.name]}</option>
+														>{$option[$input.options.name]}</option>
 
+													{/if}
+												{/foreach}
+											{/if}
+										</select>
+										{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+									{/if}
+								{elseif $input.type == 'radio'}
+									{foreach $input.values as $value}
+										<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+												{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
+												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
+										<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
+										 {if isset($input.is_bool) && $input.is_bool == true}
+											{if $value.value == 1}
+												<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
+											{else}
+												<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
+											{/if}
+										 {else}
+											{$value.label}
+										 {/if}
+										</label>
+										{if isset($input.br) && $input.br}<br />{/if}
+										{if isset($value.p) && $value.p}<p>{$value.p}</p>{/if}
+									{/foreach}
+								{elseif $input.type == 'textarea'}
+									{if isset($input.lang)}
+										<div class="translatable">
+											{foreach $languages as $language}
+												<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
+													<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte"{/if} >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
+												</div>
+											{/foreach}
+										</div>
+									{else}
+										<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
+									{/if}
+								{elseif $input.type == 'checkbox'}
+									{foreach $input.values.query as $value}
+										{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
+										<input type="checkbox"
+											name="{$id_checkbox}"
+											id="{$id_checkbox}"
+											{if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if}
+											{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
+										<label for="{$id_checkbox}" class="t"><strong>{$value[$input.values.name]}</strong></label><br />
+									{/foreach}
+								{elseif $input.type == 'file'}
+									{if isset($input.display_image) && $input.display_image}
+										{if isset($fields_value.image) && $fields_value.image}
+											<div id="image">
+												{$fields_value.image}
+												<p align="center">{l s='File size'} {$fields_value.size}kb</p>
+												<a href="{$current}&id_{$table}={$form_id}&token={$token}&deleteImage=1">
+													<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
+												</a>
+											</div><br />
+										{/if}
+									{/if}
+									<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
+									{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+								{elseif $input.type == 'password'}
+									<input type="password"
+											name="{$input.name}"
+											size="{$input.size}"
+											value=""
+											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
+								{elseif $input.type == 'birthday'}
+									{foreach $input.options as $key => $select}
+										<select name="{$key}" class="">
+											<option value="">-</option>
+											{if $key == 'months'}
+												{*
+													This comment is useful to the translator tools /!\ do not remove them
+													{l s='January'}
+													{l s='February'}
+													{l s='March'}
+													{l s='April'}
+													{l s='May'}
+													{l s='June'}
+													{l s='July'}
+													{l s='August'}
+													{l s='September'}
+													{l s='October'}
+													{l s='November'}
+													{l s='December'}
+												*}
+												{foreach $select as $k => $v}
+													<option value="{$k}" {if $k == $fields_value[$key]}selected="selected"{/if}>{l s=$v}</option>
+												{/foreach}
+											{else}
+												{foreach $select as $v}
+													<option value="{$v}" {if $v == $fields_value[$key]}selected="selected"{/if}>{$v}</option>
+												{/foreach}
+											{/if}
+
+										</select>
+									{/foreach}
+								{elseif $input.type == 'group'}
+									{assign var=groups value=$input.values}
+									{include file='helpers/form/form_group.tpl'}
+								{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
+									{$input.html}
+								{elseif $input.type == 'categories'}
+									{include file='helpers/form/form_category.tpl' categories=$input.values}
+								{elseif $input.type == 'categories_select'}
+									{$input.category_tree}
+								{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
+										{$asso_shop}
+								{elseif $input.type == 'color'}
+									<input type="color"
+										size="{$input.size}"
+										data-hex="true"
+										{if isset($input.class)}class="{$input.class}"
+										{else}class="color mColorPickerInput"{/if}
+										name="{$input.name}"
+										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+								{elseif $input.type == 'date'}
+									<input type="text"
+										size="{$input.size}"
+										data-hex="true"
+										{if isset($input.class)}class="{$input.class}"
+										{else}class="datepicker"{/if}
+										name="{$input.name}"
+										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+								{elseif $input.type == 'free'}
+									{$fields_value[$input.name]}
+								{/if}
+								{/block}
+								{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
+								{if isset($input.desc)}
+									<p class="preference_description">
+										{if is_array($input.desc)}
+											{foreach $input.desc as $p}
+												{if is_array($p)}
+													<span id="{$p.id}">{$p.text}</span><br />
+												{else}
+													{$p}<br />
 												{/if}
 											{/foreach}
-										{/if}
-									</select>
-									{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-								{/if}
-							{elseif $input.type == 'radio'}
-								{foreach $input.values as $value}
-									<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
-											{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
-											{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
-									<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
-									 {if isset($input.is_bool) && $input.is_bool == true}
-									 	{if $value.value == 1}
-									 		<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
-									 	{else}
-									 		<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
-									 	{/if}
-									 {else}
-									 	{$value.label}
-									 {/if}
-									</label>
-									{if isset($input.br) && $input.br}<br />{/if}
-									{if isset($value.p) && $value.p}<p>{$value.p}</p>{/if}
-								{/foreach}
-							{elseif $input.type == 'textarea'}
-								{if isset($input.lang)}
-									<div class="translatable">
-										{foreach $languages as $language}
-											<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-												<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte"{/if} >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
-											</div>
-										{/foreach}
-									</div>
-								{else}
-									<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
-								{/if}
-							{elseif $input.type == 'checkbox'}
-								{foreach $input.values.query as $value}
-									{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
-									<input type="checkbox"
-										name="{$id_checkbox}"
-										id="{$id_checkbox}"
-										{if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if}
-										{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
-									<label for="{$id_checkbox}" class="t"><strong>{$value[$input.values.name]}</strong></label><br />
-								{/foreach}
-							{elseif $input.type == 'file'}
-								{if isset($input.display_image) && $input.display_image}
-									{if isset($fields_value.image) && $fields_value.image}
-										<div id="image">
-											{$fields_value.image}
-											<p align="center">{l s='File size'} {$fields_value.size}kb</p>
-											<a href="{$current}&id_{$table}={$form_id}&token={$token}&deleteImage=1">
-												<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
-											</a>
-										</div><br />
-									{/if}
-								{/if}
-								<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
-								{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-							{elseif $input.type == 'password'}
-								<input type="password"
-										name="{$input.name}"
-										size="{$input.size}"
-										value=""
-										{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
-							{elseif $input.type == 'birthday'}
-								{foreach $input.options as $key => $select}
-									<select name="{$key}" class="">
-										<option value="">-</option>
-										{if $key == 'months'}
-											{*
-												This comment is useful to the translator tools /!\ do not remove them
-												{l s='January'}
-												{l s='February'}
-												{l s='March'}
-												{l s='April'}
-												{l s='May'}
-												{l s='June'}
-												{l s='July'}
-												{l s='August'}
-												{l s='September'}
-												{l s='October'}
-												{l s='November'}
-												{l s='December'}
-											*}
-											{foreach $select as $k => $v}
-												<option value="{$k}" {if $k == $fields_value[$key]}selected="selected"{/if}>{l s=$v}</option>
-											{/foreach}
 										{else}
-											{foreach $select as $v}
-												<option value="{$v}" {if $v == $fields_value[$key]}selected="selected"{/if}>{$v}</option>
-											{/foreach}
+											{$input.desc}
 										{/if}
-
-									</select>
-								{/foreach}
-							{elseif $input.type == 'group'}
-								{assign var=groups value=$input.values}
-								{include file='helpers/form/form_group.tpl'}
-							{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
-								{$input.html}
-							{elseif $input.type == 'categories'}
-								{include file='helpers/form/form_category.tpl' categories=$input.values}
-							{elseif $input.type == 'categories_select'}
-								{$input.category_tree}
-							{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
-									{$asso_shop}
-							{elseif $input.type == 'color'}
-								<input type="color"
-									size="{$input.size}"
-									data-hex="true"
-									{if isset($input.class)}class="{$input.class}"
-									{else}class="color mColorPickerInput"{/if}
-									name="{$input.name}"
-									value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
-							{elseif $input.type == 'date'}
-								<input type="text"
-									size="{$input.size}"
-									data-hex="true"
-									{if isset($input.class)}class="{$input.class}"
-									{else}class="datepicker"{/if}
-									name="{$input.name}"
-									value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
-							{elseif $input.type == 'free'}
-								{$fields_value[$input.name]}
+									</p>
+								{/if}
+								{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
+							{block name="end_field_block"}
+								</div>
+								<div class="clear"></div>
+							{/block}
+							{if $input.name == 'id_state'}
+								</div>
 							{/if}
-							{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
-							{if isset($input.desc)}
-								<p class="preference_description">
-									{if is_array($input.desc)}
-										{foreach $input.desc as $p}
-											{if is_array($p)}
-												<span id="{$p.id}">{$p.text}</span><br />
-											{else}
-												{$p}<br />
-											{/if}
-										{/foreach}
-									{else}
-										{$input.desc}
-									{/if}
-								</p>
-							{/if}
-							{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
-						{block name="end_field_block"}
-							</div>
-							<div class="clear"></div>
 						{/block}
 						{/if}
-						{if $input.name == 'id_state'}
-							</div>
-						{/if}
 					{/foreach}
 					{hook h='displayAdminForm'}
 					{if isset($name_controller)}