diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index b81ad887b555..0fc9efb9dae4 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -289,6 +289,8 @@ class CompanySettings extends BaseSettings
     public $auto_archive_invoice_cancelled = false;
 
     public static $casts = [
+        'email_subject_purchase_order'       => 'string',
+        'email_template_purchase_order'      => 'string',
         'require_purchase_order_signature'   => 'bool',
         'purchase_order_public_notes'        => 'string',
         'purchase_order_terms'               => 'string',
@@ -547,6 +549,7 @@ class CompanySettings extends BaseSettings
         'invoice_design_id',
         'quote_design_id',
         'credit_design_id',
+        'purchase_order_design_id',
     ];
 
     /**
diff --git a/app/Events/Invoice/InvoiceWasEmailedAndFailed.php b/app/Events/Invoice/InvoiceWasEmailedAndFailed.php
index a83bc07467e5..138f8960207f 100644
--- a/app/Events/Invoice/InvoiceWasEmailedAndFailed.php
+++ b/app/Events/Invoice/InvoiceWasEmailedAndFailed.php
@@ -12,7 +12,6 @@
 namespace App\Events\Invoice;
 
 use App\Models\Company;
-use App\Models\InvoiceInvitation;
 use Illuminate\Queue\SerializesModels;
 
 /**
@@ -35,12 +34,12 @@ class InvoiceWasEmailedAndFailed
     /**
      * Create a new event instance.
      *
-     * @param InvoiceInvitation $invitation
+     * @param $invitation
      * @param Company $company
      * @param string $errors
      * @param array $event_vars
      */
-    public function __construct(InvoiceInvitation $invitation, Company $company, string $message, string $template, array $event_vars)
+    public function __construct($invitation, Company $company, string $message, string $template, array $event_vars)
     {
         $this->invitation = $invitation;
 
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index df74ee4fb73b..0eae2bc67984 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -179,7 +179,7 @@ class InvoiceService
         $this->invoice = (new MarkSent($this->invoice->client, $this->invoice))->run();
 
         $this->setExchangeRate();
-
+        
         return $this;
     }
 
diff --git a/tests/Feature/CompanySettingsTest.php b/tests/Feature/CompanySettingsTest.php
index c521802586af..3c9a854329c0 100644
--- a/tests/Feature/CompanySettingsTest.php
+++ b/tests/Feature/CompanySettingsTest.php
@@ -78,10 +78,15 @@ class CompanySettingsTest extends TestCase
 
         $this->company->saveSettings($settings, $this->company);
 
+        try {
         $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-Token' => $this->token,
             ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
+        } catch (ValidationException $e) {
+            $message = json_decode($e->validator->getMessageBag(), 1);
+            nlog($message);
+        }
 
         $response->assertStatus(200);
 
diff --git a/tests/Integration/HtmlGenerationTest.php b/tests/Integration/HtmlGenerationTest.php
index eb31de791fff..c977ade9820e 100644
--- a/tests/Integration/HtmlGenerationTest.php
+++ b/tests/Integration/HtmlGenerationTest.php
@@ -13,6 +13,7 @@ namespace Tests\Integration;
 use App\Models\Credit;
 use App\Models\Design;
 use App\Models\Invoice;
+use App\Models\PurchaseOrder;
 use App\Models\Quote;
 use App\Models\RecurringInvoice;
 use App\Services\PdfMaker\Design as PdfDesignModel;
@@ -57,6 +58,8 @@ class HtmlGenerationTest extends TestCase
             $entity_design_id = 'quote_design_id';
         } elseif ($entity instanceof Credit) {
             $entity_design_id = 'credit_design_id';
+        } elseif ($entity instanceof PurchaseOrder) {
+            $entity_design_id = 'purchase_order_design_id';
         }
 
         $entity_design_id = $entity->design_id ? $entity->design_id : $this->decodePrimaryKey($entity->client->getSetting($entity_design_id));