diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 1b8bba5dde70..93c8877a22f1 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -84,9 +84,8 @@ class StoreClientRequest extends Request
             }
         }
 
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
+        $input = $this->decodePrimaryKeys($input);
+
 
         //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
         if (! property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) {
@@ -108,29 +107,6 @@ class StoreClientRequest extends Request
 
         $input['settings'] = $settings;
 
-        if (isset($input['contacts'])) {
-            foreach ($input['contacts'] as $key => $contact) {
-                if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
-                    unset($input['contacts'][$key]['id']);
-                } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
-                    $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
-                }
-
-                //Filter the client contact password - if it is sent with ***** we should ignore it!
-                if (isset($contact['password'])) {
-                    if (strlen($contact['password']) == 0) {
-                        $input['contacts'][$key]['password'] = '';
-                    } else {
-                        $contact['password'] = str_replace('*', '', $contact['password']);
-
-                        if (strlen($contact['password']) == 0) {
-                            unset($input['contacts'][$key]['password']);
-                        }
-                    }
-                }
-            }
-        }
-
         if (isset($input['country_code'])) {
             $input['country_id'] = $this->getCountryCode($input['country_code']);
         }
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index 7d9e05f4966f..a29416c06bcf 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -95,33 +95,7 @@ class UpdateClientRequest extends Request
             $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
         }
 
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['contacts'])) {
-            foreach ($input['contacts'] as $key => $contact) {
-                if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
-                    unset($input['contacts'][$key]['id']);
-                } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
-                    $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
-                }
-
-                //Filter the client contact password - if it is sent with ***** we should ignore it!
-                if (isset($contact['password'])) {
-                    if (strlen($contact['password']) == 0) {
-                        $input['contacts'][$key]['password'] = '';
-                    } else {
-                        $input['contacts'][$key]['password'] = str_replace('*', '', $contact['password']);
-
-                        if (strlen($contact['password']) == 0) {
-                            unset($input['contacts'][$key]['password']);
-                        }
-
-                    }
-                }
-            }
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         if (array_key_exists('settings', $input)) {
             $input['settings'] = $this->filterSaveableSettings($input['settings']);
diff --git a/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
index 8af355a95f79..7997eb9efa69 100644
--- a/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
+++ b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests\ClientPortal;
 
+use App\Http\Requests\Request;
 use Illuminate\Foundation\Http\FormRequest;
 
 class CreatePaymentMethodRequest extends FormRequest
diff --git a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
index dadcd7ec25a4..6db1346cbbc1 100644
--- a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
+++ b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
@@ -14,6 +14,7 @@ namespace App\Http\Requests\ClientPortal\Documents;
 
 use App\Models\Document;
 use App\Utils\Traits\MakesHash;
+
 use Illuminate\Foundation\Http\FormRequest;
 
 class ShowDocumentRequest extends FormRequest
diff --git a/app/Http/Requests/Credit/ActionCreditRequest.php b/app/Http/Requests/Credit/ActionCreditRequest.php
index 6889c663831a..41919c632822 100644
--- a/app/Http/Requests/Credit/ActionCreditRequest.php
+++ b/app/Http/Requests/Credit/ActionCreditRequest.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Http\Requests\Credit;
 
diff --git a/app/Http/Requests/Credit/CreateCreditRequest.php b/app/Http/Requests/Credit/CreateCreditRequest.php
index 686f130908d2..b4d9414de73f 100644
--- a/app/Http/Requests/Credit/CreateCreditRequest.php
+++ b/app/Http/Requests/Credit/CreateCreditRequest.php
@@ -1,11 +1,21 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Credit;
 
 use App\Models\Credit;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class CreateCreditRequest extends FormRequest
+class CreateCreditRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Credit/DestroyCreditRequest.php b/app/Http/Requests/Credit/DestroyCreditRequest.php
index 97d1f6dfc3a8..a1dc7ea842a9 100644
--- a/app/Http/Requests/Credit/DestroyCreditRequest.php
+++ b/app/Http/Requests/Credit/DestroyCreditRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Credit;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class DestroyCreditRequest extends FormRequest
+class DestroyCreditRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Credit/EditCreditRequest.php b/app/Http/Requests/Credit/EditCreditRequest.php
index e1d099d236f9..0e74b9732f4a 100644
--- a/app/Http/Requests/Credit/EditCreditRequest.php
+++ b/app/Http/Requests/Credit/EditCreditRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Credit;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class EditCreditRequest extends FormRequest
+class EditCreditRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Credit/ShowCreditRequest.php b/app/Http/Requests/Credit/ShowCreditRequest.php
index 808c45354e58..36df8054001f 100644
--- a/app/Http/Requests/Credit/ShowCreditRequest.php
+++ b/app/Http/Requests/Credit/ShowCreditRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Credit;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class ShowCreditRequest extends FormRequest
+class ShowCreditRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php
index 5c16189330f7..13a23b60dfa2 100644
--- a/app/Http/Requests/Credit/StoreCreditRequest.php
+++ b/app/Http/Requests/Credit/StoreCreditRequest.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Http\Requests\Credit;
 
@@ -6,9 +15,9 @@ use App\Http\ValidationRules\Credit\UniqueCreditNumberRule;
 use App\Models\Credit;
 use App\Utils\Traits\CleanLineItems;
 use App\Utils\Traits\MakesHash;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class StoreCreditRequest extends FormRequest
+class StoreCreditRequest extends Request
 {
     use MakesHash;
     use CleanLineItems;
@@ -57,37 +66,7 @@ class StoreCreditRequest extends FormRequest
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }
 
-        if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
-
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['client_contacts'])) {
-            foreach ($input['client_contacts'] as $key => $contact) {
-                if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
-                    unset($input['client_contacts'][$key]);
-                }
-            }
-        }
-
-        if (isset($input['invitations'])) {
-            foreach ($input['invitations'] as $key => $value) {
-                if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
-                    unset($input['invitations'][$key]['id']);
-                }
-
-                if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         //$input['line_items'] = json_encode($input['line_items']);
diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php
index 03e7ca722116..a1d1acecb056 100644
--- a/app/Http/Requests/Credit/UpdateCreditRequest.php
+++ b/app/Http/Requests/Credit/UpdateCreditRequest.php
@@ -1,13 +1,23 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Credit;
 
 use App\Utils\Traits\ChecksEntityStatus;
 use App\Utils\Traits\CleanLineItems;
 use App\Utils\Traits\MakesHash;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class UpdateCreditRequest extends FormRequest
+class UpdateCreditRequest extends Request
 {
     use MakesHash;
     use CleanLineItems;
@@ -53,33 +63,7 @@ class UpdateCreditRequest extends FormRequest
     {
         $input = $this->all();
 
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if (isset($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
-
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['invitations'])) {
-            foreach ($input['invitations'] as $key => $value) {
-                if (is_numeric($input['invitations'][$key]['id'])) {
-                    unset($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
 
diff --git a/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php b/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
index 34c6b11e3b3d..38e3b419a85d 100644
--- a/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
+++ b/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
@@ -12,9 +12,9 @@
 
 namespace App\Http\Requests\Document;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class DownloadMultipleDocumentsRequest extends FormRequest
+class DownloadMultipleDocumentsRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Expense/BulkExpenseRequest.php b/app/Http/Requests/Expense/BulkExpenseRequest.php
index ac0fade1591b..9d4d430d2586 100644
--- a/app/Http/Requests/Expense/BulkExpenseRequest.php
+++ b/app/Http/Requests/Expense/BulkExpenseRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Expense;
 
 use App\Models\Expense;
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkExpenseRequest extends FormRequest
+class BulkExpenseRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index 741cb6fabbde..520b4451a8d7 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -14,6 +14,7 @@ namespace App\Http\Requests\Expense;
 use App\DataMapper\ExpenseSettings;
 use App\Http\Requests\Request;
 use App\Http\ValidationRules\Expense\UniqueExpenseNumberRule;
+use App\Http\ValidationRules\User\RelatedUserRule;
 use App\Http\ValidationRules\ValidExpenseGroupSettingsRule;
 use App\Models\Expense;
 use App\Utils\Traits\MakesHash;
@@ -36,23 +37,24 @@ class StoreExpenseRequest extends Request
 
     public function rules()
     {
-
+        $rules = [];
 
         $rules['id_number'] = 'unique:expenses,id_number,'.$this->id.',id,company_id,'.$this->company_id;
-
         $rules['contacts.*.email'] = 'nullable|distinct';
-
         $rules['number'] = new UniqueExpenseNumberRule($this->all());
+        $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
 
-        return $rules;
+
+        return $this->globalRules($rules);
     }
 
     protected function prepareForValidation()
     {
-        // $input = $this->all();
+        $input = $this->all();
 
+        $input = $this->decodePrimaryKeys($input);
 
-        // $this->replace($input);
+        $this->replace($input);
     }
 
     public function messages()
diff --git a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
index 92b72f5e5b13..39ea6f22b2e7 100644
--- a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\ExpenseCategory;
 
 use App\Models\ExpenseCategory;
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkExpenseCategoryRequest extends FormRequest
+class BulkExpenseCategoryRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 6e0187ed7fce..827f6895d641 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -63,45 +63,7 @@ class StoreInvoiceRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
-
-        if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
-            $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
-        }
-
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['client_contacts'])) {
-            foreach ($input['client_contacts'] as $key => $contact) {
-                if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
-                    unset($input['client_contacts'][$key]);
-                }
-            }
-        }
-
-        if (isset($input['invitations'])) {
-            foreach ($input['invitations'] as $key => $value) {
-                if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
-                    unset($input['invitations'][$key]['id']);
-                }
-
-                if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         //$input['line_items'] = json_encode($input['line_items']);
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index a38cbe90f14d..6f71c4ab6dc5 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -62,35 +62,10 @@ class UpdateInvoiceRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if (isset($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
-
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
-
-        if (isset($input['invitations'])) {
-            foreach ($input['invitations'] as $key => $value) {
-                if (array_key_exists('id', $input['invitations'][$key]) && is_numeric($input['invitations'][$key]['id'])) {
-                    unset($input['invitations'][$key]['id']);
-                }
-
-                if (array_key_exists('id', $input['invitations'][$key]) && is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         $input['id'] = $this->invoice->id;
+        
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
 
         $this->replace($input);
diff --git a/app/Http/Requests/Migration/UploadMigrationFileRequest.php b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
index 0900f634a34c..6beae1f5c8c0 100644
--- a/app/Http/Requests/Migration/UploadMigrationFileRequest.php
+++ b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Migration;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class UploadMigrationFileRequest extends FormRequest
+class UploadMigrationFileRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index dbc63314054c..961fd3e93274 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -60,9 +60,7 @@ class UpdatePaymentRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
+        $input = $this->decodePrimaryKeys($input);
 
         if (isset($input['client_id'])) {
             unset($input['client_id']);
@@ -72,18 +70,6 @@ class UpdatePaymentRequest extends Request
             unset($input['amount']);
         }
 
-        // if (isset($input['type_id'])) {
-        //     unset($input['type_id']);
-        // }
-
-        // if (isset($input['date'])) {
-        //     unset($input['date']);
-        // }
-
-        // if (isset($input['transaction_reference'])) {
-        //     unset($input['transaction_reference']);
-        // }
-
         if (isset($input['number'])) {
             unset($input['number']);
         }
diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php
index 48896cd418d1..f4177fe8b4b6 100644
--- a/app/Http/Requests/Payments/PaymentWebhookRequest.php
+++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Payments;
 
 use App\Models\Company;
 use App\Models\CompanyGateway;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class PaymentWebhookRequest extends FormRequest
+class PaymentWebhookRequest extends Request
 {
     public function authorize()
     {
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 9517e75fd9cb..22397743ddbe 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -11,10 +11,14 @@
 
 namespace App\Http\Requests;
 
+use App\Http\ValidationRules\User\RelatedUserRule;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Foundation\Http\FormRequest;
 
 class Request extends FormRequest
 {
+	use MakesHash;
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -24,4 +28,124 @@ class Request extends FormRequest
     {
         return [];
     }
+
+    public function globalRules($rules)
+    {
+    	$rules = [];
+
+    	foreach($this->all() as $key => $value)
+    	{
+    		if(method_exists($this, $key))
+    			$rules = $this->{$key}($rules); 
+    	}
+
+    	return $rules;
+    }
+
+    private function assigned_user_id($rules)
+    {	
+    	$rules['assigned_user_id'] = [
+            'bail' , 
+            'sometimes', 
+            'nullable',
+                new RelatedUserRule($this->all())
+            ];
+
+        return $rules;
+    }
+
+    private function invoice_id($rules)
+    {
+        $rules['invoice_id'] = 'bail|nullable|sometimes|exists:invoices,id,company_id,'.auth()->user()->company()->id.',client_id,'.$this['client_id'];
+
+        return $rules;
+    }
+
+    private function vendor_id($rules)
+    {
+        $rules['vendor_id'] = 'bail|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id;
+
+        return $rules;
+    }
+
+    public function decodePrimaryKeys($input)
+    {
+
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+
+        if (array_key_exists('user_id', $input) && is_string($input['user_id'])) {
+            $input['user_id'] = $this->decodePrimaryKey($input['user_id']);
+        }
+
+        if (array_key_exists('vendor_id', $input) && is_string($input['vendor_id'])) {
+            $input['vendor_id'] = $this->decodePrimaryKey($input['vendor_id']);
+        }        
+
+        if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
+            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
+        }   
+
+        if (array_key_exists('invoice_id', $input) && is_string($input['invoice_id'])) {
+            $input['invoice_id'] = $this->decodePrimaryKey($input['invoice_id']);
+        }  
+
+        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
+            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
+        }
+
+        if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
+            $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
+        }
+
+        if (isset($input['client_contacts'])) {
+            foreach ($input['client_contacts'] as $key => $contact) {
+                if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
+                    unset($input['client_contacts'][$key]);
+                }
+            }
+        }
+
+        if (isset($input['invitations'])) {
+            foreach ($input['invitations'] as $key => $value) {
+                if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
+                    unset($input['invitations'][$key]['id']);
+                }
+
+                if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
+                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
+                }
+
+                if (is_string($input['invitations'][$key]['client_contact_id'])) {
+                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
+                }
+            }
+        }
+
+        if (isset($input['contacts'])) {
+            foreach ($input['contacts'] as $key => $contact) {
+                if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
+                    unset($input['contacts'][$key]['id']);
+                } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
+                    $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
+                }
+
+                //Filter the client contact password - if it is sent with ***** we should ignore it!
+                if (isset($contact['password'])) {
+                    if (strlen($contact['password']) == 0) {
+                        $input['contacts'][$key]['password'] = '';
+                    } else {
+                        $contact['password'] = str_replace('*', '', $contact['password']);
+
+                        if (strlen($contact['password']) == 0) {
+                            unset($input['contacts'][$key]['password']);
+                        }
+                    }
+                }
+            }
+        }
+        
+    	return $input;
+    }
 }
diff --git a/app/Http/Requests/Setup/CheckDatabaseRequest.php b/app/Http/Requests/Setup/CheckDatabaseRequest.php
index 082cd56cf4cc..9de2aa8a3c41 100644
--- a/app/Http/Requests/Setup/CheckDatabaseRequest.php
+++ b/app/Http/Requests/Setup/CheckDatabaseRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Setup;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class CheckDatabaseRequest extends FormRequest
+class CheckDatabaseRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Setup/CheckMailRequest.php b/app/Http/Requests/Setup/CheckMailRequest.php
index da3106ee2072..4dc58d2ecf71 100644
--- a/app/Http/Requests/Setup/CheckMailRequest.php
+++ b/app/Http/Requests/Setup/CheckMailRequest.php
@@ -1,10 +1,20 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Setup;
 
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class CheckMailRequest extends FormRequest
+class CheckMailRequest extends Request
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Task/BulkTaskRequest.php b/app/Http/Requests/Task/BulkTaskRequest.php
index a3221713cb26..876488c726fb 100644
--- a/app/Http/Requests/Task/BulkTaskRequest.php
+++ b/app/Http/Requests/Task/BulkTaskRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Task;
 
 use App\Models\Task;
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkTaskRequest extends FormRequest
+class BulkTaskRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/Requests/Token/BulkTokenRequest.php b/app/Http/Requests/Token/BulkTokenRequest.php
index e63a588479bb..21fc4c5fe21a 100644
--- a/app/Http/Requests/Token/BulkTokenRequest.php
+++ b/app/Http/Requests/Token/BulkTokenRequest.php
@@ -1,11 +1,21 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Token;
 
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkTokenRequest extends FormRequest
+class BulkTokenRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/Requests/Vendor/BulkVendorRequest.php b/app/Http/Requests/Vendor/BulkVendorRequest.php
index b576d75c0254..2f533ba18415 100644
--- a/app/Http/Requests/Vendor/BulkVendorRequest.php
+++ b/app/Http/Requests/Vendor/BulkVendorRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Vendor;
 
 use App\Models\Vendor;
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkVendorRequest extends FormRequest
+class BulkVendorRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/Requests/Vendor/StoreVendorRequest.php b/app/Http/Requests/Vendor/StoreVendorRequest.php
index f892593a51b6..f647a309fc71 100644
--- a/app/Http/Requests/Vendor/StoreVendorRequest.php
+++ b/app/Http/Requests/Vendor/StoreVendorRequest.php
@@ -50,9 +50,7 @@ class StoreVendorRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
-            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
-        }
+        $input = $this->decodePrimaryKeys($input);
         
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Webhook/BulkWebhookRequest.php b/app/Http/Requests/Webhook/BulkWebhookRequest.php
index aa178f22f266..4d10836505d2 100644
--- a/app/Http/Requests/Webhook/BulkWebhookRequest.php
+++ b/app/Http/Requests/Webhook/BulkWebhookRequest.php
@@ -1,12 +1,22 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 namespace App\Http\Requests\Webhook;
 
 use App\Models\Vendor;
 use App\Utils\Traits\BulkOptions;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
 
-class BulkWebhookRequest extends FormRequest
+class BulkWebhookRequest extends Request
 {
     use BulkOptions;
 
diff --git a/app/Http/ValidationRules/User/RelatedUserRule.php b/app/Http/ValidationRules/User/RelatedUserRule.php
new file mode 100644
index 000000000000..03fa08629958
--- /dev/null
+++ b/app/Http/ValidationRules/User/RelatedUserRule.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\ValidationRules\User;
+
+use App\Libraries\MultiDB;
+use App\Models\User;
+use Illuminate\Contracts\Validation\Rule;
+
+/**
+ * Class RelatedUserRule.
+ */
+class RelatedUserRule implements Rule
+{
+    public $input;
+
+    public function __construct($input)
+    {
+        $this->input = $input;
+    }
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->checkUserIsRelated($value);
+    }
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return 'User not associated with this account';
+    }
+
+    /**
+     * @param $email
+     * @return bool
+     */
+    private function checkUserIsRelated($user_id) : bool
+    {
+        return User::query()
+                    ->where('id', $user_id)
+                    ->where('account_id', auth()->user()->company()->account_id)
+                    ->exists();
+    }
+}
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index e8db121cb19d..1747164b7769 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -23,7 +23,9 @@ class Expense extends BaseModel
 
     protected $fillable = [
         'client_id',
+        'assigned_user_id',
         'vendor_id',
+        'invoice_id',
         'expense_currency_id',
         'date',
         'invoice_currency_id',
@@ -34,7 +36,7 @@ class Expense extends BaseModel
         'public_notes',
         'bank_id',
         'transaction_id',
-        'expense_category_id',
+        'category_id',
         'tax_rate1',
         'tax_name1',
         'tax_rate2',
diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php
index ac2f0eac9b6f..c26bde1dc1d6 100644
--- a/app/Transformers/ExpenseTransformer.php
+++ b/app/Transformers/ExpenseTransformer.php
@@ -80,6 +80,7 @@ class ExpenseTransformer extends EntityTransformer
             'transaction_id' => (string) $expense->transaction_id ?: '',
             //'date' => $expense->date ?: '',
             'expense_date' => $expense->date ?: '',
+            'number' => (string)$expense->number ?: '',
             'payment_date' => $expense->payment_date ?: '',
             'custom_value1' => $expense->custom_value1 ?: '',
             'custom_value2' => $expense->custom_value2 ?: '',
diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php
index e6a4c7799c03..5f5da73700fa 100644
--- a/app/Transformers/VendorTransformer.php
+++ b/app/Transformers/VendorTransformer.php
@@ -106,6 +106,7 @@ class VendorTransformer extends EntityTransformer
             'updated_at' => (int) $vendor->updated_at,
             'archived_at' => (int) $vendor->deleted_at,
             'created_at' => (int) $vendor->created_at,
+            'number' => (string)$vendor->number ?: '',
         ];
     }
 }
diff --git a/composer.lock b/composer.lock
index 6240140f017d..a013bee1626f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -108,16 +108,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.158.10",
+            "version": "3.158.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "a492e9aac7cba87177c06095c4e5bc9adcb1e397"
+                "reference": "cdf3c097a606087654ac90ea1ffb8f3e86c423be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a492e9aac7cba87177c06095c4e5bc9adcb1e397",
-                "reference": "a492e9aac7cba87177c06095c4e5bc9adcb1e397",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cdf3c097a606087654ac90ea1ffb8f3e86c423be",
+                "reference": "cdf3c097a606087654ac90ea1ffb8f3e86c423be",
                 "shasum": ""
             },
             "require": {
@@ -189,7 +189,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-10-20T18:11:49+00:00"
+            "time": "2020-10-21T18:12:19+00:00"
         },
         {
             "name": "brick/math",
@@ -2716,16 +2716,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.0.2",
+            "version": "v5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "87dfaaa0e0a85b707582e4f9bc8dab9664dcb0a4"
+                "reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/87dfaaa0e0a85b707582e4f9bc8dab9664dcb0a4",
-                "reference": "87dfaaa0e0a85b707582e4f9bc8dab9664dcb0a4",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/8197acf2fe5446a2800b95d250c1da72fd6051bc",
+                "reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc",
                 "shasum": ""
             },
             "require": {
@@ -2777,7 +2777,7 @@
                 "laravel",
                 "oauth"
             ],
-            "time": "2020-10-20T18:53:05+00:00"
+            "time": "2020-10-21T12:45:02+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4475,21 +4475,21 @@
         },
         {
             "name": "php-http/guzzle7-adapter",
-            "version": "0.1.0",
+            "version": "0.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/guzzle7-adapter.git",
-                "reference": "5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e"
+                "reference": "1967de656b9679a2a6a66d0e4e16fa99bbed1ad1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e",
-                "reference": "5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e",
+                "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/1967de656b9679a2a6a66d0e4e16fa99bbed1ad1",
+                "reference": "1967de656b9679a2a6a66d0e4e16fa99bbed1ad1",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/guzzle": "^7.0",
-                "php": "^7.2",
+                "php": "^7.2 | ^8.0",
                 "php-http/httplug": "^2.0",
                 "psr/http-client": "^1.0"
             },
@@ -4499,8 +4499,8 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "php-http/client-integration-tests": "^2.0",
-                "phpunit/phpunit": "^7.4"
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.0|^9.3"
             },
             "type": "library",
             "extra": {
@@ -4529,7 +4529,7 @@
                 "Guzzle",
                 "http"
             ],
-            "time": "2020-09-17T07:29:54+00:00"
+            "time": "2020-10-21T17:30:51+00:00"
         },
         {
             "name": "php-http/httplug",
@@ -6588,7 +6588,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-18T14:27:32+00:00"
+            "time": "2020-10-07T15:23:00+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -9875,22 +9875,22 @@
         },
         {
             "name": "facade/flare-client-php",
-            "version": "1.3.6",
+            "version": "1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799"
+                "reference": "fd688d3c06658f2b3b5f7bb19f051ee4ddf02492"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799",
-                "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/fd688d3c06658f2b3b5f7bb19f051ee4ddf02492",
+                "reference": "fd688d3c06658f2b3b5f7bb19f051ee4ddf02492",
                 "shasum": ""
             },
             "require": {
                 "facade/ignition-contracts": "~1.0",
                 "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0",
-                "php": "^7.1",
+                "php": "^7.1|^8.0",
                 "symfony/http-foundation": "^3.3|^4.1|^5.0",
                 "symfony/mime": "^3.4|^4.0|^5.1",
                 "symfony/var-dumper": "^3.4|^4.0|^5.0"
@@ -9932,7 +9932,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-18T06:35:11+00:00"
+            "time": "2020-10-21T16:02:39+00:00"
         },
         {
             "name": "facade/ignition",
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index 28edf4625a34..a19aa434da38 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index edd0af5e83f9..15933ca01a7b 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2019_11_10_115926_create_failed_jobs_table.php b/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
index 389bdf768a2e..170ffdaaf907 100644
--- a/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
+++ b/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_03_05_123315_create_jobs_table.php b/database/migrations/2020_03_05_123315_create_jobs_table.php
index 1be9e8a80eb1..eff8427534da 100644
--- a/database/migrations/2020_03_05_123315_create_jobs_table.php
+++ b/database/migrations/2020_03_05_123315_create_jobs_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php b/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
index 382e124fb1b8..cf77e4206c96 100644
--- a/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
+++ b/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
index 3e83effac8e8..f127d0fe793c 100644
--- a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
+++ b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_07_05_084934_company_too_large_attribute.php b/database/migrations/2020_07_05_084934_company_too_large_attribute.php
index 901b17b2debf..cbc1a64ab50e 100644
--- a/database/migrations/2020_07_05_084934_company_too_large_attribute.php
+++ b/database/migrations/2020_07_05_084934_company_too_large_attribute.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php b/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
index bb3ff9cc571b..eb8a146ae98b 100644
--- a/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
+++ b/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
index e35edfa3abb6..bb4dd4f0dbd0 100644
--- a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
+++ b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use App\Models\Company;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2020_07_28_104218_shop_token.php b/database/migrations/2020_07_28_104218_shop_token.php
index 7996ffa0a8b9..ec45510c946d 100644
--- a/database/migrations/2020_07_28_104218_shop_token.php
+++ b/database/migrations/2020_07_28_104218_shop_token.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php b/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
index c9842463e258..ce611590b45b 100644
--- a/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
+++ b/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php b/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
index 6e577081f807..c70d7565efd3 100644
--- a/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
+++ b/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_08_13_095946_remove_photo_design.php b/database/migrations/2020_08_13_095946_remove_photo_design.php
index 2c97331d02cd..fdbe03cc34a9 100644
--- a/database/migrations/2020_08_13_095946_remove_photo_design.php
+++ b/database/migrations/2020_08_13_095946_remove_photo_design.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use App\Models\Design;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php b/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
index 69cad71f2de9..09345f777525 100644
--- a/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
+++ b/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index 0e86499e7cc8..7a28dd3dfbc9 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
index a1e665959d6a..b32aa8731cfa 100644
--- a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
+++ b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
index e991241343f2..ad6e8c4c56ae 100644
--- a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
+++ b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use App\Models\Gateway;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2020_10_11_211122_vendor_schema_update.php b/database/migrations/2020_10_11_211122_vendor_schema_update.php
index cafedf9a10b5..ee0347eece3a 100644
--- a/database/migrations/2020_10_11_211122_vendor_schema_update.php
+++ b/database/migrations/2020_10_11_211122_vendor_schema_update.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_10_12_204517_project_number_column.php b/database/migrations/2020_10_12_204517_project_number_column.php
index 9dc9740191df..1b24a2f9dd37 100644
--- a/database/migrations/2020_10_12_204517_project_number_column.php
+++ b/database/migrations/2020_10_12_204517_project_number_column.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_10_14_201320_project_ids_to_entities.php b/database/migrations/2020_10_14_201320_project_ids_to_entities.php
index f203b9de1bea..3f6546ce1109 100644
--- a/database/migrations/2020_10_14_201320_project_ids_to_entities.php
+++ b/database/migrations/2020_10_14_201320_project_ids_to_entities.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_10_19_101823_project_name_unique_removal.php b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
index 9125c6953a05..f4408ad7b99b 100644
--- a/database/migrations/2020_10_19_101823_project_name_unique_removal.php
+++ b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
new file mode 100644
index 000000000000..6a88014227da
--- /dev/null
+++ b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ExpensesNullableAssignedUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('expenses', function(Blueprint $table) {
+
+            $table->unsignedInteger('assigned_user_id')->nullable()->change();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 440ecfdd3001..1834a754da2a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -18,7 +18,6 @@ Route::group(['middleware' => ['api_secret_check']], function () {
 
 Route::group(['api_secret_check', 'email_db'], function () {
     Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
-    // Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.reset');
     Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
 
 });
diff --git a/tests/Feature/ActivityApiTest.php b/tests/Feature/ActivityApiTest.php
new file mode 100644
index 000000000000..70357b0d5110
--- /dev/null
+++ b/tests/Feature/ActivityApiTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Feature;
+
+use Faker\Factory;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\MockAccountData;
+use Tests\TestCase;
+
+/**
+ * @test
+ * @covers App\Http\Controllers\ActivityController
+ */
+class ActivityApiTest extends TestCase
+{
+
+    use DatabaseTransactions;
+    use MockAccountData;
+
+    public function setUp() :void
+    {
+        parent::setUp();
+
+        $this->makeTestData();
+
+    }
+
+    public function testActivityGet()
+    {
+        $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->get('/api/v1/activities/');
+
+        $response->assertStatus(200);
+    }
+
+}
diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
index d7496d1d9fcf..5a2f51c530c3 100644
--- a/tests/Feature/ClientTest.php
+++ b/tests/Feature/ClientTest.php
@@ -516,7 +516,7 @@ class ClientTest extends TestCase
         $response->assertStatus(200);
 
         $arr = $response->json();
-
+info($arr);
         $this->client = Client::find($this->decodePrimaryKey($arr['data']['id']));
         $this->client->fresh();
 
diff --git a/tests/Feature/PingTest.php b/tests/Feature/PingTest.php
new file mode 100644
index 000000000000..ae808d5d7d01
--- /dev/null
+++ b/tests/Feature/PingTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\MockAccountData;
+use Tests\TestCase;
+
+/**
+ * @test
+ * @covers App\Http\Controllers\PingController
+ */
+class PingTest extends TestCase
+{
+    use DatabaseTransactions;
+    use MockAccountData;
+
+    public function setUp() :void
+    {
+        parent::setUp();
+        $this->makeTestData();
+
+    }
+
+    public function testPingEndPoint()
+    {
+
+        $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/ping');
+
+        $response->assertStatus(200);
+
+    }
+
+    public function testHealthCheck()
+    {
+
+        $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/health_check');
+
+        $response->assertStatus(200);
+
+    }
+}
diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php
index 0f438b5c8c57..d7216518ffd5 100644
--- a/tests/Integration/CompanyLedgerTest.php
+++ b/tests/Integration/CompanyLedgerTest.php
@@ -36,6 +36,7 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Schema;
 use Tests\MockAccountData;
 use Tests\TestCase;
+use Illuminate\Validation\ValidationException;
 
 /** @test*/
 class CompanyLedgerTest extends TestCase
@@ -57,6 +58,9 @@ class CompanyLedgerTest extends TestCase
     {
         parent::setUp();
 
+        $this->withoutExceptionHandling();
+
+
         /* Warm up the cache !*/
         $cached_tables = config('ninja.cached_tables');
 
@@ -222,10 +226,15 @@ class CompanyLedgerTest extends TestCase
             'date' => '2020/12/11',
         ];
 
+        try {
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/payments/', $data);
+    
+        } catch (ValidationException $e) {
+            info(print_r($e->validator->getMessageBag(), 1));
+        }
 
         $acc = $response->json();