diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php
index 648bb043fdcc..9cc4147908b8 100644
--- a/app/Helpers/Mail/GmailTransport.php
+++ b/app/Helpers/Mail/GmailTransport.php
@@ -74,14 +74,12 @@ class GmailTransport extends Transport
             
             }
 
-
         } 
 
         $this->gmail->send();
 
         $this->sendPerformed($message);
 
-
         return $this->numberOfRecipients($message);
     }
 }
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 62b3e938d130..60b64ec24408 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -102,8 +102,6 @@ class CreateEntityPdf implements ShouldQueue
         /* Set the locale*/
         App::setLocale($this->contact->preferredLocale());
 
-        // nlog($this->entity->client->getMergedSettings());
-
         /* Set customized translations _NOW_ */
         $t->replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
 
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 6febb5876f43..f86191d99f38 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -415,7 +415,7 @@ class Invoice extends BaseModel
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
         }
         elseif(Ninja::isHosted() && $portal){
-            $file_path = CreateEntityPdf::dispatchNow($invitation,config('filesystems.default'));
+            $file_path = CreateEntityPdf::dispatchNow($invitation, config('filesystems.default'));
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
         }
         
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 54049fa00269..a26e41d368e2 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -307,7 +307,7 @@ class InvoiceService
 
     public function deletePdf()
     {
-        //UnlinkFile::dispatchNow(config('filesystems.default'), $this->invoice->client->invoice_filepath() . $this->invoice->numberFormatter().'.pdf');
+
         Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath() . $this->invoice->numberFormatter().'.pdf');
         
         if(Ninja::isHosted()) {
@@ -351,8 +351,17 @@ class InvoiceService
      * PDF when it is updated etc.
      * @return InvoiceService
      */
-    public function touchPdf()
+    public function touchPdf($force = false)
     {
+        if($force){
+
+            $this->invoice->invitations->each(function ($invitation) {
+                CreateEntityPdf::dispatchNow($invitation);
+            });
+
+            return $this;
+        }
+
         $this->invoice->invitations->each(function ($invitation) {
             CreateEntityPdf::dispatch($invitation);
         });