diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php
index a01c93d40e6a..8d3f4891893b 100755
--- a/app/controllers/ClientController.php
+++ b/app/controllers/ClientController.php
@@ -199,6 +199,7 @@ class ClientController extends \BaseController {
 			}
 
 			$client->name = trim(Input::get('name'));
+            $client->vat_number = trim(Input::get('vat_number'));
 			$client->work_phone = trim(Input::get('work_phone'));
 			$client->custom_value1 = trim(Input::get('custom_value1'));
 			$client->custom_value2 = trim(Input::get('custom_value2'));
diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index 4438fef6b979..b4100f1dc84c 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -94,7 +94,8 @@ class Invoice extends EntityModel
 			'custom_taxes2']);
 		
 		$this->client->setVisible([
-			'name', 
+			'name',
+            'vat_number',
 			'address1', 
 			'address2', 
 			'city', 
@@ -109,7 +110,8 @@ class Invoice extends EntityModel
 			'custom_value2']);
 
 		$this->account->setVisible([
-			'name', 
+			'name',
+            'vat_number',
 			'address1', 
 			'address2', 
 			'city', 
diff --git a/app/ninja/repositories/ClientRepository.php b/app/ninja/repositories/ClientRepository.php
index 4b56bc135f37..363647e047be 100755
--- a/app/ninja/repositories/ClientRepository.php
+++ b/app/ninja/repositories/ClientRepository.php
@@ -62,6 +62,9 @@ class ClientRepository
 		if (isset($data['name'])) {
 			$client->name = trim($data['name']);
 		}
+        if (isset($data['vat_number'])) {
+			$client->vat_number = trim($data['vat_number']);
+		}
 		if (isset($data['work_phone'])) {
 			$client->work_phone = trim($data['work_phone']);
 		}
diff --git a/app/views/client.blade.php b/app/views/client.blade.php
index 7794f9adcd3c..a1912b0709ed 100755
--- a/app/views/client.blade.php
+++ b/app/views/client.blade.php
@@ -4,6 +4,7 @@
 
 		{{ Former::legend('Organization') }}
 		{{ Former::text('name') }}
+        {{ Former::text('vat_number') }}
 		{{ Former::text('work_phone')->label('Phone') }}
 		{{ Former::textarea('notes') }}
 
diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php
index f4b1ff4622b5..cdda093eeea0 100755
--- a/app/views/clients/edit.blade.php
+++ b/app/views/clients/edit.blade.php
@@ -23,7 +23,8 @@
 
 			{{ Former::legend('organization') }}
 			{{ Former::text('name')->data_bind("attr { placeholder: placeholderName }") }}
-			{{ Former::text('website') }}
+			{{ Former::text('vat_number') }}
+            {{ Former::text('website') }}
 			{{ Former::text('work_phone') }}
 			
 			@if (Auth::user()->isPro())				
diff --git a/app/views/clients/show.blade.php b/app/views/clients/show.blade.php
index 2acde1633b51..39eb1b42dd30 100755
--- a/app/views/clients/show.blade.php
+++ b/app/views/clients/show.blade.php
@@ -39,7 +39,8 @@
 
 		<div class="col-md-3">
 			<h3>{{ trans('texts.details') }}</h3>
-		  	<p>{{ $client->getAddress() }}</p>
+		  	<p>{{ $client->getVatNumber() }}</p>
+            <p>{{ $client->getAddress() }}</p>
 		  	<p>{{ $client->getCustomFields() }}</p>
 		  	<p>{{ $client->getPhone() }}</p>
 		  	<p>{{ $client->getNotes() }}</p>
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 384a5af17b47..ecd924a13abe 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -340,6 +340,8 @@
 
 				{{ Former::legend('organization') }}
 				{{ Former::text('name')->data_bind("value: name, valueUpdate: 'afterkeydown', attr { placeholder: name.placeholder }") }}
+                {{ Former::text('vat_number')->data_bind("value: vat_number, valueUpdate: 'afterkeydown'") }}
+                
 				{{ Former::text('website')->data_bind("value: website, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('work_phone')->data_bind("value: work_phone, valueUpdate: 'afterkeydown'") }}
 
@@ -1210,6 +1212,7 @@
 		var self = this;
 		self.public_id = ko.observable(0);
 		self.name = ko.observable('');
+        self.vat_number = ko.observable('');
 		self.work_phone = ko.observable('');
 		self.custom_value1 = ko.observable('');
 		self.custom_value2 = ko.observable('');