diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index b3ec1221a..1457760c1 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -46,7 +46,6 @@ var countriesNeedZipCode = new Array();
 $(function(){ldelim}
 	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
 {rdelim});
-{if $vat_management}
 {literal}
 	$(document).ready(function() {
 		$('#company').blur(function(){
@@ -62,7 +61,6 @@ $(function(){ldelim}
 		}
 	});
 {/literal}
-{/if}
 //]]>
 </script>
 
@@ -104,13 +102,7 @@ $(function(){ldelim}
 			<label for="company">{l s='Company'}</label>
 			<input type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company}{/if}{/if}" />
 		</p>
-		{if $vat_display == 2}
-			<div id="vat_area">
-		{elseif $vat_display == 1}
-			<div id="vat_area" style="display: none;">
-		{else}
-			<div style="display: none;">
-		{/if}
+		<div id="vat_area">
 			<div id="vat_number">
 				<p class="text">
 					<label for="vat_number">{l s='VAT number'}</label>
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index d399a326b..b7d151a60 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -52,23 +52,21 @@ $(function(){ldelim}
 	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
 {rdelim});
 //]]>
-{if $vat_management}
-	{literal}
-	$(document).ready(function() {
-		$('#company').blur(function(){
-			vat_number();
-		});
+{literal}
+$(document).ready(function() {
+	$('#company').blur(function(){
 		vat_number();
-		function vat_number()
-		{
-			if ($('#company').val() != '')
-				$('#vat_number').show();
-			else
-				$('#vat_number').hide();
-		}
 	});
-	{/literal}
-{/if}
+	vat_number();
+	function vat_number()
+	{
+		if ($('#company').val() != '')
+			$('#vat_number').show();
+		else
+			$('#vat_number').hide();
+	}
+});
+{/literal}
 </script>
 
 <h1>{if !isset($email_create)}{l s='Log in'}{else}{l s='Create an account'}{/if}</h1>
diff --git a/themes/default/mobile/address.tpl b/themes/default/mobile/address.tpl
index 715b309b6..9bdfd1e97 100644
--- a/themes/default/mobile/address.tpl
+++ b/themes/default/mobile/address.tpl
@@ -51,22 +51,20 @@ countriesNeedZipCode = new Array();
 $(function(){ldelim}
 	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address->id_state)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
 {rdelim});
-{if $vat_management}
 {literal}
-	$(document).ready(function() {
-		$('#company').blur(function(){
-			vat_number();
-		});
+$(document).ready(function() {
+	$('#company').blur(function(){
 		vat_number();
-		function vat_number()
-		{
-			if ($('#company').val() != '')
-				$('#vat_number').show();
-			else
-				$('#vat_number').hide();
-		}
 	});
-{/literal}
+	vat_number();
+	function vat_number()
+	{
+		if ($('#company').val() != '')
+			$('#vat_number').show();
+		else
+			$('#vat_number').hide();
+	}
+});
 {/if}
 //]]>
 </script>
diff --git a/themes/default/mobile/authentication.tpl b/themes/default/mobile/authentication.tpl
index 9b86507fc..ebad48543 100644
--- a/themes/default/mobile/authentication.tpl
+++ b/themes/default/mobile/authentication.tpl
@@ -53,23 +53,21 @@ $(function(){ldelim}
 	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
 {rdelim});
 //]]>
-{if $vat_management}
-	{literal}
-	$(document).ready(function() {
-		$('#company').blur(function(){
-			vat_number();
-		});
+{literal}
+$(document).ready(function() {
+	$('#company').blur(function(){
 		vat_number();
-		function vat_number()
-		{
-			if ($('#company').val() != '')
-				$('#vat_number').show();
-			else
-				$('#vat_number').hide();
-		}
 	});
-	{/literal}
-{/if}
+	vat_number();
+	function vat_number()
+	{
+		if ($('#company').val() != '')
+			$('#vat_number').show();
+		else
+			$('#vat_number').hide();
+	}
+});
+{/literal}
 </script>
 
 {assign var='stateExist' value=false}
@@ -77,4 +75,4 @@ $(function(){ldelim}
 	{include file="./authentication-choice.tpl"}
 {else}
 	{include file="./authentication-create-account.tpl"}
-{/if}
+{/if}
\ No newline at end of file
diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl
index 5342482df..419002291 100644
--- a/themes/default/order-opc-new-account.tpl
+++ b/themes/default/order-opc-new-account.tpl
@@ -71,35 +71,33 @@
 					{/foreach}
 				{/if}
 				//]]>
-				{if $vat_management}
-					{literal}
-					function vat_number()
-					{
-						if ($('#company').val() != '')
-							$('#vat_number_block').show();
-						else
-							$('#vat_number_block').hide();
-					}
-					function vat_number_invoice()
-					{
-						if ($('#company_invoice').val() != '')
-							$('#vat_number_block_invoice').show();
-						else
-							$('#vat_number_block_invoice').hide();
-					}
-					
-					$(document).ready(function() {
-						$('#company').blur(function(){
-							vat_number();
-						});
-						$('#company_invoice').blur(function(){
-							vat_number_invoice();
-						});
+				{literal}
+				function vat_number()
+				{
+					if ($('#company').val() != '')
+						$('#vat_number_block').show();
+					else
+						$('#vat_number_block').hide();
+				}
+				function vat_number_invoice()
+				{
+					if ($('#company_invoice').val() != '')
+						$('#vat_number_block_invoice').show();
+					else
+						$('#vat_number_block_invoice').hide();
+				}
+				
+				$(document).ready(function() {
+					$('#company').blur(function(){
 						vat_number();
+					});
+					$('#company_invoice').blur(function(){
 						vat_number_invoice();
 					});
-					{/literal}
-				{/if}
+					vat_number();
+					vat_number_invoice();
+				});
+				{/literal}
 				</script>
 				<!-- Error return block -->
 				<div id="opc_account_errors" class="error" style="display:none;"></div>