diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 193b37636472..28483f901e67 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -209,7 +209,7 @@ class InvoiceController extends BaseController {
 
 		$client = Client::find($request->input('client_id'));
 
-		$invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company(), auth()->user()->id));
+		$invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
 		$invoice = StoreInvoice::dispatchNow($invoice, $request->all(), $invoice->company);//todo potentially this may return mixed ie PDF/$invoice... need to revisit when we implement UI
 
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 752fe7e2d4d7..3f3eadadbf91 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -467,7 +467,7 @@ class Client extends BaseModel implements HasLocalePreference
     }
 
 
-    public function setInvoiceDefaults() :Invoice
+    public function setInvoiceDefaults($invoice) :Invoice
     {
         $invoice->terms = $this->getSetting('invoice_terms');
         $invoice->footer = $this->getSetting('invoice_footer');
@@ -476,7 +476,7 @@ class Client extends BaseModel implements HasLocalePreference
         return $invoice;
     }
 
-    public function setQuoteDefaults() :Quote
+    public function setQuoteDefaults($quote) :Quote
     {
         $quote->terms = $this->getSetting('quote_terms');
         $quote->footer = $this->getSetting('quote_footer');
@@ -485,7 +485,7 @@ class Client extends BaseModel implements HasLocalePreference
         return $quote;
     }
 
-    public function setCreditDefaults() :Credit
+    public function setCreditDefaults($credit) :Credit
     {
         $credit->terms = $this->getSetting('credit_terms');
         $credit->footer = $this->getSetting('credit_footer');
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 79ee175b4b86..8fe5798ba259 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -197,7 +197,7 @@ class BaseRepository
         //if new, set defaults!
         if(!$model->id) {
             $methodName = "set" . $resource . "Defaults";
-            $model = $client->{$methodName}();
+            $model = $client->{$methodName}($model);
         }