diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 55b5d1322d75..99d5b04c8eb1 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -94,7 +94,7 @@ class PreviewController extends BaseController
             request()->has('body'))
         {
 
-            $invoice_design = new Custom(json_decode(request()->input('body')));
+            $invoice_design = new Custom(json_encode(request()->input('body')));
 
             $entity = ucfirst(request()->input('entity'));
 
@@ -148,12 +148,13 @@ class PreviewController extends BaseController
             $invoice->setRelation('company', auth()->user()->company());
             $invoice->load('client');
 
-           // $design_object = json_decode(request()->input('body'));
+
+            $design_object = json_encode(request()->all());
 
             if(!is_object($design_object))
                 return response()->json(['message' => 'Invalid custom design object'], 400);
 
-            $invoice_design = new Custom(json_decode(request()->input('body')));
+            $invoice_design = new Custom($design_object);
 
             $designer = new Designer($invoice, $invoice_design, $invoice->client->getSetting('pdf_variables'), lcfirst(request()->has('entity')));
 
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index a382e0f6076c..03c13f258e14 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -45,11 +45,12 @@ class StoreInvoiceRequest extends Request
     protected function prepareForValidation()
     {
         $input = $this->all();
+\Log::error(print_r($input,));
 
         if(array_key_exists('design_id', $input) && is_string($input['design_id']))
           $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
 
-        if($input['client_id'])
+        if(array_key_exists('client_id', $input) && is_string($input['client_id']))
           $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
 
         if(isset($input['client_contacts']))
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 74d25a31a541..917c93d38cbe 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -191,13 +191,10 @@ class UserTest extends TestCase
 
         $arr = $response->json();
 
-\Log::error($arr);
-\Log::error(print_r($arr['data']['company_user'],1));
-
         $this->assertNotNull($arr['data']['company_user']);
         $this->assertFalse($arr['data']['company_user']['is_admin']);
         $this->assertFalse($arr['data']['company_user']['is_owner']);
-        $this->assertEquals($arr['data']['company_user']['permissions'], ['create_client,create_invoice']);
+        $this->assertEquals($arr['data']['company_user']['permissions'], 'create_client,create_invoice');
 
         $user = User::whereEmail('bob@good.ole.boys.co2.com')->first();