diff --git a/app/Http/Controllers/Users/AgencyController.php b/app/Http/Controllers/Users/AgencyController.php
index e9716e0..bacdbc3 100644
--- a/app/Http/Controllers/Users/AgencyController.php
+++ b/app/Http/Controllers/Users/AgencyController.php
@@ -47,6 +47,7 @@ class AgencyController extends Controller
             'address' => 'required|string|max:255',
             'city'    => 'required|string|max:100',
             'phone'   => 'required|string|max:255',
+            'tax_id'  => 'nullable|string|max:255',
         ]);
 
         Option::set('agency_name', request('name'));
@@ -56,6 +57,7 @@ class AgencyController extends Controller
         Option::set('agency_address', request('address'));
         Option::set('agency_city', request('city'));
         Option::set('agency_phone', request('phone'));
+        Option::set('agency_tax_id', request('tax_id'));
 
         flash(__('agency.updated'), 'success');
 
diff --git a/resources/lang/de/agency.php b/resources/lang/de/agency.php
index 00cd3e6..0905ac7 100644
--- a/resources/lang/de/agency.php
+++ b/resources/lang/de/agency.php
@@ -22,4 +22,5 @@ return [
     'address' => 'Agentur Adresse',
     'phone'   => 'Agentur Telefon',
     'logo'    => 'Agentur Logo',
+    'tax_id'  => 'Tax ID Number',
 ];
diff --git a/resources/lang/en/agency.php b/resources/lang/en/agency.php
index bf75f59..e875da0 100644
--- a/resources/lang/en/agency.php
+++ b/resources/lang/en/agency.php
@@ -22,4 +22,5 @@ return [
     'address' => 'Agency Address',
     'phone'   => 'Agency Phone',
     'logo'    => 'Agency Logo',
+    'tax_id'  => 'Tax ID Number',
 ];
diff --git a/resources/lang/id/agency.php b/resources/lang/id/agency.php
index e33cc41..319543d 100644
--- a/resources/lang/id/agency.php
+++ b/resources/lang/id/agency.php
@@ -22,4 +22,5 @@ return [
     'address' => 'Alamat Agensi',
     'phone'   => 'Telp. Agensi',
     'logo'    => 'Logo Agensi',
+    'tax_id'  => 'NPWP',
 ];
diff --git a/resources/views/users/agency/edit.blade.php b/resources/views/users/agency/edit.blade.php
index 805be35..5b430b2 100644
--- a/resources/views/users/agency/edit.blade.php
+++ b/resources/views/users/agency/edit.blade.php
@@ -21,8 +21,11 @@
             <div class="col-md-6">{!! FormField::text('phone', ['value' => Option::get('agency_phone')]) !!}</div>
         </div>
         {!! FormField::textarea('address', ['value' => Option::get('agency_address')]) !!}
-        {!! FormField::text('city', ['value' => Option::get('agency_city')]) !!}
-        {!! FormField::text('website', ['value' => Option::get('agency_website')]) !!}
+        <div class="row">
+            <div class="col-md-6">{!! FormField::text('city', ['value' => Option::get('agency_city')]) !!}</div>
+            <div class="col-md-6">{!! FormField::text('website', ['value' => Option::get('agency_website')]) !!}</div>
+        </div>
+        {!! FormField::text('tax_id', ['label' => __('agency.tax_id'), 'value' => Option::get('agency_tax_id')]) !!}
     </div>
     {{ Form::close() }}
     <div class="col-md-3 text-center">
diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php
index 25e375e..9507913 100644
--- a/resources/views/users/agency/show.blade.php
+++ b/resources/views/users/agency/show.blade.php
@@ -28,6 +28,7 @@
                 <tr><th>{{ trans('address.address') }}</th><td>{!! nl2br(Option::get('agency_address')) !!}</td></tr>
                 <tr><th>{{ trans('address.city') }}</th><td>{{ Option::get('agency_city') }}</td></tr>
                 <tr><th>{{ trans('contact.website') }}</th><td>{{ Option::get('agency_website') }}</td></tr>
+                <tr><th>{{ trans('agency.tax_id') }}</th><td>{{ Option::get('agency_tax_id') }}</td></tr>
             </table>
         </div>
     </div>
diff --git a/tests/Feature/AgencyProfileTest.php b/tests/Feature/AgencyProfileTest.php
index 56c9854..df87083 100644
--- a/tests/Feature/AgencyProfileTest.php
+++ b/tests/Feature/AgencyProfileTest.php
@@ -36,6 +36,7 @@ class AgencyProfileTest extends TestCase
             'phone'   => '081234567890',
             'city'    => 'Jakarta',
             'website' => 'https://example.com',
+            'tax_id'  => '14.817.xxx.x-xxx.000',
         ]);
 
         $this->see(trans('agency.updated'));
@@ -69,6 +70,10 @@ class AgencyProfileTest extends TestCase
             'key'   => 'agency_tagline',
             'value' => 'Tagline agensi saya',
         ]);
+        $this->seeInDatabase('site_options', [
+            'key'   => 'agency_tax_id',
+            'value' => '14.817.xxx.x-xxx.000',
+        ]);
     }
 
     /** @test */