diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 483218ad37f1..89e29a16cf44 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -282,7 +282,7 @@ class ClientController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $client->company, $client);
 
-        event(new ClientWasUpdated($client, $client->company, Ninja::eventVars(auth()->user()->id)));
+        event(new ClientWasUpdated($client, $client->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($client->fresh());
     }
@@ -380,7 +380,7 @@ class ClientController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $client->company, $client);
 
-        event(new ClientWasCreated($client, $client->company, Ninja::eventVars(auth()->user()->id)));
+        event(new ClientWasCreated($client, $client->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($client);
     }
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index e454b80590f2..459e70116918 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -201,7 +201,7 @@ class CreditController extends BaseController
                          ->fillDefaults()
                          ->save();
 
-        event(new CreditWasCreated($credit, $credit->company, Ninja::eventVars(auth()->user()->id)));
+        event(new CreditWasCreated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($credit);
     }
@@ -378,7 +378,7 @@ class CreditController extends BaseController
 
         $credit->service()->deletePdf();
         
-        event(new CreditWasUpdated($credit, $credit->company, Ninja::eventVars(auth()->user()->id)));
+        event(new CreditWasUpdated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($credit);
     }
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 0d10c051306a..e4f01b0f6834 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -157,7 +157,7 @@ class EmailController extends BaseController
             $this->entity_transformer = QuoteTransformer::class;
 
             if ($entity_obj->invitations->count() >= 1) 
-                event(new QuoteWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user()->id), 'quote'));
+                event(new QuoteWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), 'quote'));
             
         }
 
@@ -166,7 +166,7 @@ class EmailController extends BaseController
             $this->entity_transformer = CreditTransformer::class;
 
             if ($entity_obj->invitations->count() >= 1) 
-                event(new CreditWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user()->id), 'credit'));
+                event(new CreditWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), 'credit'));
             
         }
 
diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index 35984b3d5282..a6d1b4fa2bc7 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -279,7 +279,7 @@ class ExpenseController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $expense->company, $expense);
 
-        event(new ExpenseWasUpdated($expense, $expense->company, Ninja::eventVars(auth()->user()->id)));
+        event(new ExpenseWasUpdated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($expense->fresh());
     }
@@ -373,7 +373,7 @@ class ExpenseController extends BaseController
     {
         $expense = $this->expense_repo->save($request->all(), ExpenseFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
-        event(new ExpenseWasCreated($expense, $expense->company, Ninja::eventVars(auth()->user()->id)));
+        event(new ExpenseWasCreated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($expense);
     }
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index bd4fc7a21ba7..885d4798be66 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -218,7 +218,7 @@ class InvoiceController extends BaseController
                            ->triggeredActions($request)
                            ->save();
 
-        event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars(auth()->user()->id)));
+        event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         
         return $this->itemResponse($invoice);
     }
@@ -399,7 +399,7 @@ class InvoiceController extends BaseController
         
         $invoice->service()->deletePdf();
 
-        event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user()->id)));
+        event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($invoice);
     }
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index f96388245f59..a5381f9301e7 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -385,7 +385,7 @@ class PaymentController extends BaseController
 
         $payment = $this->payment_repo->save($request->all(), $payment);
 
-        event(new PaymentWasUpdated($payment, $payment->company, Ninja::eventVars(auth()->user()->id)));
+        event(new PaymentWasUpdated($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         return $this->itemResponse($payment);
     }
 
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index eba6624638c3..ff7c212eacf8 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -211,7 +211,7 @@ class QuoteController extends BaseController
 
         $quote = $quote->service()->fillDefaults()->save();
 
-        event(new QuoteWasCreated($quote, $quote->company, Ninja::eventVars(auth()->user()->id)));
+        event(new QuoteWasCreated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($quote);
     }
@@ -389,7 +389,7 @@ class QuoteController extends BaseController
 
         $quote->service()->deletePdf();
         
-        event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user()->id)));
+        event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($quote);
     }
diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
index f7662aad50ff..1b081a279ead 100644
--- a/app/Http/Controllers/SubscriptionController.php
+++ b/app/Http/Controllers/SubscriptionController.php
@@ -177,7 +177,7 @@ class SubscriptionController extends BaseController
     {
         $subscription = $this->subscription_repo->save($request->all(), SubscriptionFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
-        event(new SubscriptionWasCreated($subscription, $subscription->company, Ninja::eventVars(auth()->user()->id)));
+        event(new SubscriptionWasCreated($subscription, $subscription->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($subscription);
     }
@@ -352,7 +352,7 @@ class SubscriptionController extends BaseController
 
         $subscription = $this->subscription_repo->save($request->all(), $subscription);
 
-        event(new SubscriptionWasUpdated($subscription, $subscription->company, Ninja::eventVars(auth()->user()->id)));
+        event(new SubscriptionWasUpdated($subscription, $subscription->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($subscription);
     }
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 0447b2f63868..7bd10084893c 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -284,7 +284,7 @@ class TaskController extends BaseController
         if($task->status_order != $old_task->status_order)
             $this->task_repo->sortStatuses($old_task, $task);
 
-        event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user()->id)));
+        event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($task->fresh());
     }
@@ -378,7 +378,7 @@ class TaskController extends BaseController
     {
         $task = $this->task_repo->save($request->all(), TaskFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
-        event(new TaskWasCreated($task, $task->company, Ninja::eventVars(auth()->user()->id)));
+        event(new TaskWasCreated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($task);
     }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6f9fa7a56a82..c633371dc000 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -211,7 +211,7 @@ class UserController extends BaseController
 
             nlog("in the store method of the usercontroller class");
 
-        event(new UserWasCreated($user, auth()->user(), $company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasCreated($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($user->fresh());
     }
@@ -401,7 +401,7 @@ class UserController extends BaseController
             $user->company_user()->update(["permissions_updated_at" => now()]);
         }
 
-        event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($user);
     }
@@ -474,7 +474,7 @@ class UserController extends BaseController
         /* If the user passes the company user we archive the company user */
         $user = $this->user_repo->delete($request->all(), $user);
 
-        event(new UserWasDeleted($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasDeleted($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($user->fresh());
     }
diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php
index 01ddf93bd4e6..2c215a9a3d62 100644
--- a/app/Http/Controllers/VendorController.php
+++ b/app/Http/Controllers/VendorController.php
@@ -278,7 +278,7 @@ class VendorController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $vendor->company, $vendor);
 
-        event(new VendorWasUpdated($vendor, $vendor->company, Ninja::eventVars(auth()->user()->id)));
+        event(new VendorWasUpdated($vendor, $vendor->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($vendor->fresh());
     }
@@ -376,7 +376,7 @@ class VendorController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $vendor->company, $vendor);
 
-        event(new VendorWasCreated($vendor, $vendor->company, Ninja::eventVars(auth()->user()->id)));
+        event(new VendorWasCreated($vendor, $vendor->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($vendor);
     }
diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php
index 7a9f324c0b35..6e8b04f90f9e 100644
--- a/app/Jobs/Entity/EmailEntity.php
+++ b/app/Jobs/Entity/EmailEntity.php
@@ -144,7 +144,7 @@ class EmailEntity implements ShouldQueue
     {
         switch ($this->entity_string) {
             case 'invoice':
-                event(new InvoiceWasEmailedAndFailed($this->invitation, $this->company, $message, $this->reminder_template, Ninja::eventVars(auth()->user()->id)));
+                event(new InvoiceWasEmailedAndFailed($this->invitation, $this->company, $message, $this->reminder_template, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
                 break;
 
             default:
diff --git a/app/Models/Company.php b/app/Models/Company.php
index c0ed357362dc..ab808ac3510e 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -88,6 +88,7 @@ class Company extends BaseModel
         'oauth_password_required',
         'invoice_task_datelog',
         'default_password_timeout',
+        'show_task_end_date',
     ];
 
     protected $hidden = [
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index 3890fe7c9b91..e30838f9f5dc 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -255,10 +255,10 @@ class Credit extends BaseModel
         }
 
         if (! $invitation) {
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
             CreateEntityPdf::dispatchNow($this->invitations->first());
         } else {
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
             CreateEntityPdf::dispatchNow($invitation);
         }
 
diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php
index d8938f702dac..2db1c1316702 100644
--- a/app/Models/CreditInvitation.php
+++ b/app/Models/CreditInvitation.php
@@ -129,7 +129,7 @@ class CreditInvitation extends BaseModel
         $storage_path = Storage::url($this->credit->client->quote_filepath().$this->credit->numberFormatter().'.pdf');
 
         if (! Storage::exists($this->credit->client->credit_filepath().$this->credit->numberFormatter().'.pdf')) {
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
             CreateEntityPdf::dispatchNow($this);
         }
 
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 123cddd6615e..1731b75aacf9 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -243,7 +243,7 @@ class Payment extends BaseModel
             $this->status_id = $this->refunded == $this->amount ? self::STATUS_REFUNDED : self::STATUS_PARTIALLY_REFUNDED;
             $this->save();
 
-            event(new PaymentWasRefunded($this, $refund_change, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new PaymentWasRefunded($this, $refund_change, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
 
         return true;
@@ -280,7 +280,7 @@ class Payment extends BaseModel
         $this->status_id = self::STATUS_CANCELLED;
         $this->save();
 
-        event(new PaymentWasVoided($this, $this->company, Ninja::eventVars(auth()->user()->id)));
+        event(new PaymentWasVoided($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
     }
 
     public function getLink()
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 68d37826847f..2da173705b4d 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -213,7 +213,7 @@ class Quote extends BaseModel
         nlog($storage_path);
 
         if (! Storage::exists($this->client->quote_filepath().$this->numberFormatter().'.pdf')) {
-            event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
             CreateEntityPdf::dispatchNow($invitation);
         }
 
diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php
index 8506a80f23fd..901d0bc54e12 100644
--- a/app/Models/QuoteInvitation.php
+++ b/app/Models/QuoteInvitation.php
@@ -133,7 +133,7 @@ class QuoteInvitation extends BaseModel
         $storage_path = Storage::url($this->quote->client->quote_filepath().$this->quote->numberFormatter().'.pdf');
 
         if (! Storage::exists($this->quote->client->quote_filepath().$this->quote->numberFormatter().'.pdf')) {
-            event(new QuoteWasUpdated($this->quote, $this->company, Ninja::eventVars(auth()->user()->id)));
+            event(new QuoteWasUpdated($this->quote, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
             CreateEntityPdf::dispatchNow($this);
         }
 
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index a1084a2d4342..9cafb79bfbd6 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -55,7 +55,7 @@ class BaseRepository
         $className = $this->getEventClass($entity, 'Archived');
 
         if (class_exists($className)) {
-            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user()->id)));
+            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
     }
 
@@ -81,7 +81,7 @@ class BaseRepository
         $className = $this->getEventClass($entity, 'Restored');
 
         if (class_exists($className)) {
-            event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->user()->id)));
+            event(new $className($entity, $fromDeleted, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
     }
 
@@ -102,7 +102,7 @@ class BaseRepository
         $className = $this->getEventClass($entity, 'Deleted');
 
         if (class_exists($className) && ! ($entity instanceof Company)) {
-            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user()->id)));
+            event(new $className($entity, $entity->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
     }
 
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index 43235573e257..bd09af5b3b66 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -159,7 +159,7 @@ class PaymentRepository extends BaseRepository {
             if ($payment->client->getSetting('client_manual_payment_notification')) 
                 $payment->service()->sendEmail();
 			
-            event( new PaymentWasCreated( $payment, $payment->company, Ninja::eventVars(auth()->user()->id) ) );
+            event( new PaymentWasCreated( $payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null) ) );
 		}
 
         nlog("payment amount = {$payment->amount}");
@@ -209,7 +209,7 @@ class PaymentRepository extends BaseRepository {
 
         $payment = $payment->service()->deletePayment();
 
-        event(new PaymentWasDeleted($payment, $payment->company, Ninja::eventVars(auth()->user()->id)));
+        event(new PaymentWasDeleted($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $payment;
         //return parent::delete($payment);
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 19c7535c2824..3df53b3b1d88 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -123,7 +123,7 @@ class UserRepository extends BaseRepository
             $cu->forceDelete();
         }
 
-        event(new UserWasDeleted($user, $company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasDeleted($user, $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         $user->delete();
 
@@ -146,7 +146,7 @@ class UserRepository extends BaseRepository
             $cu->delete();
         }
 
-        event(new UserWasDeleted($user, auth()->user(), $company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasDeleted($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
          $user->is_deleted = true;
          $user->save();
@@ -164,7 +164,7 @@ class UserRepository extends BaseRepository
 
         $user->delete();
 
-        event(new UserWasArchived($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasArchived($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
     }
 
@@ -189,7 +189,7 @@ class UserRepository extends BaseRepository
 
         $cu->restore();
 
-        event(new UserWasRestored($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user()->id)));
+        event(new UserWasRestored($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
     }
 }
diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php
index 74803a8e7f1d..b2409165fa5a 100644
--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@@ -112,10 +112,10 @@ class RefundPayment
         if (isset($this->refund_data['invoices'])) {
             foreach ($this->refund_data['invoices'] as $invoice) {
                 $fields->invoice_id = $invoice['invoice_id'];
-                $activity_repo->save($fields, $this->payment, Ninja::eventVars(auth()->user()->id));
+                $activity_repo->save($fields, $this->payment, Ninja::eventVars(auth()->user() ? auth()->user()->id : null));
             }
         } else {
-            $activity_repo->save($fields, $this->payment, Ninja::eventVars(auth()->user()->id));
+            $activity_repo->save($fields, $this->payment, Ninja::eventVars(auth()->user() ? auth()->user()->id : null));
         }
 
         return $this;
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 6cc11510b541..3d18d545fd87 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -158,6 +158,7 @@ class CompanyTransformer extends EntityTransformer
             'session_timeout' => (int)$company->session_timeout,
             'default_password_timeout' => (int) $company->default_password_timeout,
             'invoice_task_datelog' => (bool) $company->invoice_task_datelog,
+            'show_task_end_date' => (bool) $company->show_task_end_date,
         ];
     }
 
diff --git a/app/Utils/Traits/Payment/Refundable.php b/app/Utils/Traits/Payment/Refundable.php
index 5d9e8f6e82b7..1edaf89900c3 100644
--- a/app/Utils/Traits/Payment/Refundable.php
+++ b/app/Utils/Traits/Payment/Refundable.php
@@ -211,10 +211,10 @@ trait Refundable
             foreach ($data['invoices'] as $invoice) {
                 $fields->invoice_id = $invoice->id;
 
-                $activity_repo->save($fields, $this, Ninja::eventVars(auth()->user()->id));
+                $activity_repo->save($fields, $this, Ninja::eventVars(auth()->user() ? auth()->user()->id : null));
             }
         } else {
-            $activity_repo->save($fields, $this, Ninja::eventVars(auth()->user()->id));
+            $activity_repo->save($fields, $this, Ninja::eventVars(auth()->user() ? auth()->user()->id : null));
         }
     }
 
diff --git a/database/migrations/2021_05_06_211039_add_show_task_end_date_to_companies_table.php b/database/migrations/2021_05_06_211039_add_show_task_end_date_to_companies_table.php
new file mode 100644
index 000000000000..1ede03b3a492
--- /dev/null
+++ b/database/migrations/2021_05_06_211039_add_show_task_end_date_to_companies_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddShowTaskEndDateToCompaniesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->boolean('show_task_end_date')->default('false');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            //
+        });
+    }
+}