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/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index c1eefc1..c830812 100755
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -59,14 +59,14 @@
                     </div>
                 </td>
                 <td style="width:270px; text-align: center;">
-                    <h3 style="margin: 3px 0; font-size: 24px">{{ trans('invoice.invoice') }}</h3>
-                    <div style="margin: 5px">{{ trans('invoice.number') }} : INV-{{ $invoice->number }}</div>
-                    <div>{{ trans('app.date') }} : {{ dateId($invoice->date) }}</div>
+                    <h3 style="margin: 3px 0; font-size: 24px">{{ __('invoice.invoice') }}</h3>
+                    <div style="margin: 5px">{{ __('invoice.number') }} : INV-{{ $invoice->number }}</div>
+                    <div>{{ __('app.date') }} : {{ dateId($invoice->date) }}</div>
                 </td>
             </tr>
             <tr>
                 <td colspan="2">
-                    <h4 style="margin: 3px 0;">{{ trans('app.to') }} :</h4>
+                    <h4 style="margin: 3px 0;">{{ __('app.to') }} :</h4>
                     @php
                         $customer = $invoice->project->customer;
                     @endphp
@@ -75,7 +75,7 @@
                     <p style="max-width: 250px;font-size: 14px">{!! nl2br($customer->address) !!}</p>
                     @endif
                     @if ($customer->phone)
-                    <p>{{ trans('contact.phone') }} : {{ $customer->phone }}</p>
+                    <p>{{ __('contact.phone') }} : {{ $customer->phone }}</p>
                     @endif
                     @if ($customer->website)
                     <p>{{ $customer->website }}</p>
@@ -86,20 +86,24 @@
                 </td>
                 <td class="text-center text-top">
                     @if ($invoice->due_date)
-                    <h4 style="margin: 30px 3px 0;">{{ trans('invoice.due_date') }}</h4>
-                    <p>{{ dateId($invoice->due_date) }}</p>
+                        <h4 style="margin: 30px 3px 0;">{{ __('invoice.due_date') }}</h4>
+                        <p>{{ dateId($invoice->due_date) }}</p>
+                    @endif
+                    @if ($taxId = Option::get('agency_tax_id'))
+                        <h4 style="margin: 30px 3px 0;">{{ __('agency.tax_id') }}</h4>
+                        <p>{{ $taxId }}</p>
                     @endif
                 </td>
             </tr>
-            <tr><td colspan="3">{{ trans('invoice.items') }} :</td></tr>
+            <tr><td colspan="3">{{ __('invoice.items') }} :</td></tr>
             <tr>
                 <td colspan="3">
                 <table border="1" class="receipt-table" style="width: 100%;font-size: 14px">
                     <thead style="background-color: #FFC800">
                         <tr>
-                            <th width="5%">{{ trans('app.table_no') }}</th>
-                            <th width="70%" class="text-left">{{ trans('invoice.item_description') }}</th>
-                            <th width="25%">{{ trans('invoice.item_amount') }}</th>
+                            <th width="5%">{{ __('app.table_no') }}</th>
+                            <th width="70%" class="text-left">{{ __('invoice.item_description') }}</th>
+                            <th width="25%">{{ __('invoice.item_amount') }}</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -130,7 +134,7 @@
                         </tr>
                         @endif
                         <tr>
-                            <th colspan="2" class="text-right">{{ trans('app.total') }}</th>
+                            <th colspan="2" class="text-right">{{ __('app.total') }}</th>
                             <th colspan="2" class="text-right">{{ formatRp($invoice->amount) }}</th>
                         </tr>
                     </tbody>
@@ -138,7 +142,7 @@
                 </td>
             </tr>
             <tr style="vertical-align: top;">
-                <td style="padding-top: 20px;">{{ trans('payment.words_amount') }} : </td>
+                <td style="padding-top: 20px;">{{ __('payment.words_amount') }} : </td>
                 <td colspan="2" style="font-weight: bold; padding-top: 20px">
                     {{ ucwords(Terbilang::make($invoice->amount)) }} {{ Option::get('money_sign_in_word', 'Rupiah') }}
                 </td>
@@ -158,9 +162,9 @@
                         @foreach ($bankAccounts as $key => $bankAccount)
                             @php $bankAccount = (object) $bankAccount; @endphp
                             <table style="border: 1px solid #ccc;width: 330px">
-                                <tr><td style="width: 100px">{{ trans('bank_account.name') }}</td><td>: <strong>{{ $bankAccount->name }}</strong></td></tr>
-                                <tr><td>{{ trans('bank_account.number') }}</td><td>: <strong>{{ $bankAccount->number }}</strong></td></tr>
-                                <tr><td>{{ trans('bank_account.account_name') }}</td><td>: <strong>{{ $bankAccount->account_name }}</strong></td></tr>
+                                <tr><td style="width: 100px">{{ __('bank_account.name') }}</td><td>: <strong>{{ $bankAccount->name }}</strong></td></tr>
+                                <tr><td>{{ __('bank_account.number') }}</td><td>: <strong>{{ $bankAccount->number }}</strong></td></tr>
+                                <tr><td>{{ __('bank_account.account_name') }}</td><td>: <strong>{{ $bankAccount->account_name }}</strong></td></tr>
                             </table>
                             @if ($key == count($bankAccounts)) <br> @endif
                         @endforeach
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 */