diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index c270757bffbd..162865acf44a 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -33,6 +33,12 @@ class UpdateClientRequest extends Request
         /* Ensure we have a client name, and that all emails are unique*/
         $rules['name'] = 'required';
 
+        $rules['industry_id'] = 'integer|nullable';
+        $rules['size_id'] = 'integer|nullable';
+        $rules['currency_id'] = 'integer|nullable';
+        $rules['country_id'] = 'integer|nullable';
+        $rules['shipping_country_id'] = 'integer|nullable';
+
         $contacts = request('contacts');
 
             if(is_array($contacts))
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index 07a1a71a60c8..1e933de98877 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -34,32 +34,11 @@ class StoreInvoiceRequest extends Request
 
         return [
             'client_id' => 'required',
+            'invoice_type_id' => 'integer',
+
       //      'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
         ];
     }
 
-/* If we have an email address instead of a client_id - harvest the client_id here 
-public function sanitize()
-{
-    $input = $this->all();
-
-    
-    if(isset($input['email']) && !$input['client_id'])
-    {
-        $contact = ClientContact::company(auth()->user()->company()->id)->whereEmail($input['email'])->first();
-
-        if($contact)
-            $input['client_id'] = $contact->client_id;
-    }
-
-    $this->replace($input);     
-}
-
-    public function messages()
-    {
-
-    }
-*/
-
 }
 
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index 3805946cc14d..ad897fe43649 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -35,6 +35,8 @@ class UpdateInvoiceRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
+            'invoice_type_id' => 'integer',
         ];
     }
     
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index 4750af45e334..7263ec9fce07 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -31,6 +31,10 @@ class StorePaymentRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'integer|nullable',
+            'payment_type_id' => 'integer|nullable',
+            'amount' => 'numeric',
+            'payment_date' => 'required',
         ];
     }
 
diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index 22231dd7a102..4c184310d9d0 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -34,6 +34,10 @@ class UpdatePaymentRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'integer|nullable',
+            'payment_type_id' => 'integer|nullable',
+            'amount' => 'numeric',
+            'payment_date' => 'required',
         ];
     }
     
diff --git a/app/Http/Requests/Product/StoreProductRequest.php b/app/Http/Requests/Product/StoreProductRequest.php
index fec03a526ec3..9962712e246e 100644
--- a/app/Http/Requests/Product/StoreProductRequest.php
+++ b/app/Http/Requests/Product/StoreProductRequest.php
@@ -31,6 +31,9 @@ class StoreProductRequest extends Request
     {
         return [
             'product_key' => 'required|unique:products,product_key,null,null,company_id,'.auth()->user()->companyId(),
+            'cost' => 'numeric',
+            'price' => 'numeric',
+            'qty' => 'numeric',
         ];
     }
 
diff --git a/app/Http/Requests/Product/UpdateProductRequest.php b/app/Http/Requests/Product/UpdateProductRequest.php
index daa15e55e3c9..c4a22728114e 100644
--- a/app/Http/Requests/Product/UpdateProductRequest.php
+++ b/app/Http/Requests/Product/UpdateProductRequest.php
@@ -36,6 +36,9 @@ class UpdateProductRequest extends Request
 
         return [
             'product_key' => 'unique:products,product_key,'.$this->product->id.',id,company_id,'.auth()->user()->companyId(),
+            'cost' => 'numeric',
+            'price' => 'numeric',
+            'qty' => 'numeric',
         ];
     }
 
diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php
index 6d5acbc800ec..8bbd192d89ee 100644
--- a/app/Http/Requests/Quote/StoreQuoteRequest.php
+++ b/app/Http/Requests/Quote/StoreQuoteRequest.php
@@ -31,6 +31,8 @@ class StoreQuoteRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
+
         ];
     }
 
diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php
index a90a1a5b54a6..f10ddb053cb1 100644
--- a/app/Http/Requests/Quote/UpdateQuoteRequest.php
+++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php
@@ -35,6 +35,7 @@ class UpdateQuoteRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
         ];
     }
     
diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index eca033e0e017..54e86add6277 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -31,6 +31,7 @@ class StoreRecurringInvoiceRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
         ];
     }
 
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index e9ff05daeca0..5e652b570e15 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -35,6 +35,8 @@ class UpdateRecurringInvoiceRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
+
         ];
     }
     
diff --git a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
index e62834f8f8f4..25c8e344bb66 100644
--- a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
@@ -31,6 +31,8 @@ class StoreRecurringQuoteRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
+
         ];
     }
 
diff --git a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
index 8e5f1f17bdcb..b27f9687810c 100644
--- a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
@@ -35,6 +35,8 @@ class UpdateRecurringQuoteRequest extends Request
     {
         return [
             'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
+            'client_id' => 'required|integer',
+
         ];
     }