diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index befbc43789b3..b7a4a385789f 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -92,11 +92,14 @@ class InvoiceController extends Controller
      */
     public function bulk(ProcessInvoicesInBulkRequest $request)
     {
+//        \Log::error($request->all());
         $transformed_ids = $this->transformKeys($request->invoices);
 
-        if (request()->input('action') == 'payment') {
+//\Log::error($transformed_ids);
+
+        if ($request->input('action') == 'payment') {
             return $this->makePayment((array)$transformed_ids);
-        } elseif (request()->input('action') == 'download') {
+        } elseif ($request->input('action') == 'download') {
             return $this->downloadInvoicePDF((array)$transformed_ids);
         }
 
@@ -109,6 +112,7 @@ class InvoiceController extends Controller
         $invoices = Invoice::whereIn('id', $ids)
                             ->whereClientId(auth()->user()->client->id)
                             ->get();
+//\Log::error($invoices);
 
         $total = $invoices->sum('balance');
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 64938ad1391b..71466fb0e7fc 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -151,7 +151,7 @@ class UserController extends BaseController
      */
     public function create(CreateUserRequest $request)
     {
-        $user = UserFactory::create();
+        $user = UserFactory::create(auth()->user()->account->id);
 
         return $this->itemResponse($user);
     }
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 110c927b5ccc..a166145d18b9 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -47,7 +47,7 @@ class QueryLogging
                 $count = count($queries);
                 $timeEnd = microtime(true);
                 $time = $timeEnd - $timeStart;
-                Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
+               // Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
                 
                 //     if($count > 50)
             //        Log::info($queries);
diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index bce91953b56c..3ccc4df32757 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -80,7 +80,7 @@ class StoreUserRequest extends Request
         $user = MultiDB::hasUser(['email' => $this->input('email')]);
 
         if (!$user) {
-            $user = UserFactory::create();
+            $user = UserFactory::create(auth()->user()->account->id);
         }
 
         return $user;
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 0b9d9470a7ec..edc953db013c 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -689,7 +689,7 @@ class Import implements ShouldQueue
         $user = MultiDB::hasUser(['email' => $data]);
 
         if (!$user) {
-            $user = UserFactory::create();
+            $user = UserFactory::create($this->company->account->id);
         }
 
         return $user;
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index bac4b54e4e77..843c886d7e9b 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -47,14 +47,14 @@ trait MakesInvoiceHtml
         $data = [];
         $data['entity'] = $entity;
         $data['lang'] = $client->preferredLocale();
-        $data['includes'] = $this->parseLabelsAndValues($labels, $values, $designer->init()->getIncludes()->getHtml());
-        $data['header'] = $this->parseLabelsAndValues($labels, $values, $designer->init()->getHeader()->getHtml());
-        $data['body'] = $this->parseLabelsAndValues($labels, $values, $designer->init()->getBody()->getHtml());
-        $data['footer'] = $this->parseLabelsAndValues($labels, $values, $designer->init()->getFooter()->getHtml());
+        $data['includes'] = $designer->init()->getIncludes()->getHtml();
+        $data['header'] = $designer->init()->getHeader()->getHtml();
+        $data['body'] = $designer->init()->getBody()->getHtml();
+        $data['footer'] = $designer->init()->getFooter()->getHtml();
 
         $html = view('pdf.stub', $data)->render();
         
-        // \Log::error($html);
+        $html = $this->parseLabelsAndValues($labels, $values, $html);
         
         return $html;
     }
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index a959cb803f66..ab96484f6b16 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -91,7 +91,7 @@ class UserTest extends TestCase
 
     public function testUserAttachAndDetach()
     {
-        $user = UserFactory::create();
+        $user = UserFactory::create($this->account->id);
         $user->first_name = 'Test';
         $user->last_name = 'Palloni';
         $user->save();
@@ -149,7 +149,7 @@ class UserTest extends TestCase
         $cu->save();
 
         /*Create New Blank User and Attach to Company 2*/
-        $new_user = UserFactory::create();
+        $new_user = UserFactory::create($this->account->id);
         $new_user->first_name = 'Test';
         $new_user->last_name = 'Palloni';
         $new_user->save();