diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 95159c25b..a588fb58d 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -94,8 +94,8 @@ $(function(){ldelim}
 			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'html'}{/if}{/if}" />
 			<span class="form_info">{l s='DNI / NIF / NIE'}</span>
 		</p>
-	{assign var="stateExist" value="false"}
-	{assign var="postCodeExist" value="false"}
+	{assign var="stateExist" value=false}
+	{assign var="postCodeExist" value=false}
 	{foreach from=$ordered_adr_fields item=field_name}
 		{if $field_name eq 'company'}
 		<p class="text">
@@ -138,7 +138,7 @@ $(function(){ldelim}
 		</p>
 		{/if}
 		{if $field_name eq 'postcode'}
-		{assign var="postCodeExist" value="true"}
+		{assign var="postCodeExist" value=true}
 		<p class="required postcode text">
 			<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
 			<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
@@ -187,7 +187,7 @@ $(function(){ldelim}
 		{/if}
 		{/if}
 		{if $field_name eq 'State:name'}
-		{assign var="stateExist" value="true"}
+		{assign var="stateExist" value=true}
 		<p class="required id_state select">
 			<label for="id_state">{l s='State'} <sup>*</sup></label>
 			<select name="id_state" id="id_state">
@@ -196,13 +196,13 @@ $(function(){ldelim}
 		</p>
 		{/if}
 		{/foreach}
-		{if $postCodeExist eq "false"}
+		{if !$postCodeExist}
 		<p class="required postcode text hidden">
 			<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
 			<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
 		</p>
 		{/if}		
-		{if $stateExist eq "false"}
+		{if !$stateExist}
 		<p class="required id_state select">
 			<label for="id_state">{l s='State'} <sup>*</sup></label>
 			<select name="id_state" id="id_state">