diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 9e87ba0bc291..82cb7b4c0220 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -164,17 +164,7 @@ class PreviewController extends BaseController
             DB::connection(config('database.default'))->beginTransaction();
 
             $entity = ucfirst(request()->input('entity'));
-
-            // $class = "App\Models\\$entity";
-
-            // $entity_obj = $class::whereId($this->decodePrimaryKey(request()->input('entity_id')))->company()->first();
-
-          //  if (! $entity_obj) {
-
             $entity_obj = $repo->save(request()->all(), $factory);
-
-           // }
-
             $entity_obj->load('client');
 
             App::forgetInstance('translator');
@@ -238,10 +228,8 @@ class PreviewController extends BaseController
                 return (new NinjaPdf())->build($maker->getCompiledHTML(true));
             }
 
-            //else
             $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
 
-            //return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
 
         $response = Response::make($file_path, 200);
         $response->header('Content-Type', 'application/pdf');
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 34aa257d3129..db95b09c8e02 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -477,19 +477,19 @@ class Invoice extends BaseModel
     {
         switch ($reminder_template) {
             case 'invoice':
-                event(new InvoiceWasEmailed($invitation, $invitation->company, Ninja::eventVars(), $template));
+                event(new InvoiceWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), $template));
                 break;
             case 'reminder1':
-                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(), Activity::INVOICE_REMINDER1_SENT));
+                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), Activity::INVOICE_REMINDER1_SENT));
                 break;
             case 'reminder2':
-                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(), Activity::INVOICE_REMINDER2_SENT));
+                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), Activity::INVOICE_REMINDER2_SENT));
                 break;
             case 'reminder3':
-                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(), Activity::INVOICE_REMINDER3_SENT));
+                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), Activity::INVOICE_REMINDER3_SENT));
                 break;
             case 'reminder_endless':
-                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(), Activity::INVOICE_REMINDER_ENDLESS_SENT));
+                event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), Activity::INVOICE_REMINDER_ENDLESS_SENT));
                 break;
             default:
                 # code...