diff --git a/app/Listeners/Activity/CreatedClientActivity.php b/app/Listeners/Activity/CreatedClientActivity.php
index 9134661fe770..1d5074d6058a 100644
--- a/app/Listeners/Activity/CreatedClientActivity.php
+++ b/app/Listeners/Activity/CreatedClientActivity.php
@@ -43,7 +43,7 @@ class CreatedClientActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreatedCreditActivity.php b/app/Listeners/Activity/CreatedCreditActivity.php
index 62681bfb738e..c676fc402742 100644
--- a/app/Listeners/Activity/CreatedCreditActivity.php
+++ b/app/Listeners/Activity/CreatedCreditActivity.php
@@ -43,7 +43,7 @@ class CreatedCreditActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreatedExpenseActivity.php b/app/Listeners/Activity/CreatedExpenseActivity.php
index c6e46122cd5f..99be93837bd7 100644
--- a/app/Listeners/Activity/CreatedExpenseActivity.php
+++ b/app/Listeners/Activity/CreatedExpenseActivity.php
@@ -43,7 +43,7 @@ class CreatedExpenseActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreatedQuoteActivity.php b/app/Listeners/Activity/CreatedQuoteActivity.php
index 6b4acc22ff37..b04015563233 100644
--- a/app/Listeners/Activity/CreatedQuoteActivity.php
+++ b/app/Listeners/Activity/CreatedQuoteActivity.php
@@ -43,7 +43,7 @@ class CreatedQuoteActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->quote_id = $event->quote->id;
         $fields->client_id = $event->quote->client_id;
diff --git a/app/Listeners/Activity/CreatedSubscriptionActivity.php b/app/Listeners/Activity/CreatedSubscriptionActivity.php
index 9bf46e8a05ff..59b4bb449c4e 100644
--- a/app/Listeners/Activity/CreatedSubscriptionActivity.php
+++ b/app/Listeners/Activity/CreatedSubscriptionActivity.php
@@ -43,7 +43,7 @@ class CreatedSubscriptionActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreatedTaskActivity.php b/app/Listeners/Activity/CreatedTaskActivity.php
index 0f3f75287bde..9076ba8230ab 100644
--- a/app/Listeners/Activity/CreatedTaskActivity.php
+++ b/app/Listeners/Activity/CreatedTaskActivity.php
@@ -43,7 +43,7 @@ class CreatedTaskActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->task->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreatedVendorActivity.php b/app/Listeners/Activity/CreatedVendorActivity.php
index 7fe7b474ad40..6972dc4bbdcd 100644
--- a/app/Listeners/Activity/CreatedVendorActivity.php
+++ b/app/Listeners/Activity/CreatedVendorActivity.php
@@ -43,7 +43,7 @@ class CreatedVendorActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/CreditArchivedActivity.php b/app/Listeners/Activity/CreditArchivedActivity.php
index 03107a672288..8ca0d5870250 100644
--- a/app/Listeners/Activity/CreditArchivedActivity.php
+++ b/app/Listeners/Activity/CreditArchivedActivity.php
@@ -43,7 +43,7 @@ class CreditArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;
diff --git a/app/Listeners/Activity/DeleteClientActivity.php b/app/Listeners/Activity/DeleteClientActivity.php
index 4df70c7a8d39..3bbb9757bca7 100644
--- a/app/Listeners/Activity/DeleteClientActivity.php
+++ b/app/Listeners/Activity/DeleteClientActivity.php
@@ -43,7 +43,7 @@ class DeleteClientActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/DeleteCreditActivity.php b/app/Listeners/Activity/DeleteCreditActivity.php
index d23a7c99a7de..40cb092efeb4 100644
--- a/app/Listeners/Activity/DeleteCreditActivity.php
+++ b/app/Listeners/Activity/DeleteCreditActivity.php
@@ -43,7 +43,7 @@ class DeleteCreditActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->client_id = $event->credit->client_id;
         $fields->credit_id = $event->credit->id;
diff --git a/app/Listeners/Activity/ExpenseArchivedActivity.php b/app/Listeners/Activity/ExpenseArchivedActivity.php
index 1a548b933681..12c0e02fd133 100644
--- a/app/Listeners/Activity/ExpenseArchivedActivity.php
+++ b/app/Listeners/Activity/ExpenseArchivedActivity.php
@@ -45,7 +45,7 @@ class ExpenseArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/ExpenseDeletedActivity.php b/app/Listeners/Activity/ExpenseDeletedActivity.php
index df526220bfad..cc2ece4ba12e 100644
--- a/app/Listeners/Activity/ExpenseDeletedActivity.php
+++ b/app/Listeners/Activity/ExpenseDeletedActivity.php
@@ -43,7 +43,7 @@ class ExpenseDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/ExpenseRestoredActivity.php b/app/Listeners/Activity/ExpenseRestoredActivity.php
index c81873b22e82..e91edda27fec 100644
--- a/app/Listeners/Activity/ExpenseRestoredActivity.php
+++ b/app/Listeners/Activity/ExpenseRestoredActivity.php
@@ -43,7 +43,7 @@ class ExpenseRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/ExpenseUpdatedActivity.php b/app/Listeners/Activity/ExpenseUpdatedActivity.php
index 6c71bbfcbbaf..ab51fc2c6803 100644
--- a/app/Listeners/Activity/ExpenseUpdatedActivity.php
+++ b/app/Listeners/Activity/ExpenseUpdatedActivity.php
@@ -43,7 +43,7 @@ class ExpenseUpdatedActivity implements ShouldQueue
 
         $expense = $event->expense;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields = new stdClass;
 
diff --git a/app/Listeners/Activity/PaymentArchivedActivity.php b/app/Listeners/Activity/PaymentArchivedActivity.php
index 1245e4e606d3..9a56087b8a30 100644
--- a/app/Listeners/Activity/PaymentArchivedActivity.php
+++ b/app/Listeners/Activity/PaymentArchivedActivity.php
@@ -48,7 +48,7 @@ class PaymentArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->payment_id = $payment->id;
         $fields->client_id = $payment->client_id;
diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php
index be114e0a094a..25eca61cddae 100644
--- a/app/Listeners/Activity/PaymentCreatedActivity.php
+++ b/app/Listeners/Activity/PaymentCreatedActivity.php
@@ -50,7 +50,7 @@ class PaymentCreatedActivity implements ShouldQueue
             $invoice_id = $payment->invoices()->first()->id;
         }
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields = new stdClass;
 
@@ -60,7 +60,8 @@ class PaymentCreatedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $payment->company_id;
         $fields->activity_type_id = Activity::CREATE_PAYMENT;
-
+        $fields->client_contact_id = $payment->client_contact_id ?? null;
+        
         $this->activity_repo->save($fields, $payment, $event->event_vars);
 
     }
diff --git a/app/Listeners/Activity/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php
index c0c20973e578..d67ef4b1552d 100644
--- a/app/Listeners/Activity/PaymentDeletedActivity.php
+++ b/app/Listeners/Activity/PaymentDeletedActivity.php
@@ -43,7 +43,7 @@ class PaymentDeletedActivity implements ShouldQueue
 
         $payment = $event->payment;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $invoices = $payment->invoices;
 
diff --git a/app/Listeners/Activity/PaymentRefundedActivity.php b/app/Listeners/Activity/PaymentRefundedActivity.php
index 7cf9ca4d1e86..985b55eece6d 100644
--- a/app/Listeners/Activity/PaymentRefundedActivity.php
+++ b/app/Listeners/Activity/PaymentRefundedActivity.php
@@ -43,7 +43,7 @@ class PaymentRefundedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->client_id = $event->payment->client_id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/PaymentUpdatedActivity.php b/app/Listeners/Activity/PaymentUpdatedActivity.php
index 25d6c671be9d..fcc4510e09e6 100644
--- a/app/Listeners/Activity/PaymentUpdatedActivity.php
+++ b/app/Listeners/Activity/PaymentUpdatedActivity.php
@@ -48,7 +48,7 @@ class PaymentUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->payment_id = $payment->id;
         $fields->client_id = $payment->client_id;
diff --git a/app/Listeners/Activity/PaymentVoidedActivity.php b/app/Listeners/Activity/PaymentVoidedActivity.php
index 7a332d46f260..d619094215d9 100644
--- a/app/Listeners/Activity/PaymentVoidedActivity.php
+++ b/app/Listeners/Activity/PaymentVoidedActivity.php
@@ -43,7 +43,7 @@ class PaymentVoidedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->client_id = $event->payment->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/QuoteUpdatedActivity.php b/app/Listeners/Activity/QuoteUpdatedActivity.php
index 8ae4c132ff8a..c9476d81de3a 100644
--- a/app/Listeners/Activity/QuoteUpdatedActivity.php
+++ b/app/Listeners/Activity/QuoteUpdatedActivity.php
@@ -45,7 +45,7 @@ class QuoteUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->quote_id = $quote->id;
         $fields->client_id = $quote->client_id;
diff --git a/app/Listeners/Activity/RestoreClientActivity.php b/app/Listeners/Activity/RestoreClientActivity.php
index 709ff0f7d1d3..39680b236275 100644
--- a/app/Listeners/Activity/RestoreClientActivity.php
+++ b/app/Listeners/Activity/RestoreClientActivity.php
@@ -43,7 +43,7 @@ class RestoreClientActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/SubscriptionArchivedActivity.php b/app/Listeners/Activity/SubscriptionArchivedActivity.php
index ca359b5f4d9b..c62199cd47cd 100644
--- a/app/Listeners/Activity/SubscriptionArchivedActivity.php
+++ b/app/Listeners/Activity/SubscriptionArchivedActivity.php
@@ -45,7 +45,7 @@ class SubscriptionArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $subscription->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/SubscriptionDeletedActivity.php b/app/Listeners/Activity/SubscriptionDeletedActivity.php
index 3da4d642a34f..196f9c907ca7 100644
--- a/app/Listeners/Activity/SubscriptionDeletedActivity.php
+++ b/app/Listeners/Activity/SubscriptionDeletedActivity.php
@@ -43,7 +43,7 @@ class SubscriptionDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/SubscriptionRestoredActivity.php b/app/Listeners/Activity/SubscriptionRestoredActivity.php
index f72593494c2b..bfaa6979884c 100644
--- a/app/Listeners/Activity/SubscriptionRestoredActivity.php
+++ b/app/Listeners/Activity/SubscriptionRestoredActivity.php
@@ -43,7 +43,7 @@ class SubscriptionRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $event->subscription->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/SubscriptionUpdatedActivity.php b/app/Listeners/Activity/SubscriptionUpdatedActivity.php
index c1e3ce1acd56..8697dcbe5299 100644
--- a/app/Listeners/Activity/SubscriptionUpdatedActivity.php
+++ b/app/Listeners/Activity/SubscriptionUpdatedActivity.php
@@ -45,7 +45,7 @@ class SubscriptionUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->subscription->user_id;
 
         $fields->subscription_id = $subscription->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/TaskArchivedActivity.php b/app/Listeners/Activity/TaskArchivedActivity.php
index 73c638bacbc2..14511536152c 100644
--- a/app/Listeners/Activity/TaskArchivedActivity.php
+++ b/app/Listeners/Activity/TaskArchivedActivity.php
@@ -45,7 +45,7 @@ class TaskArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $task->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/TaskDeletedActivity.php b/app/Listeners/Activity/TaskDeletedActivity.php
index 258811b628b6..bff746719bc6 100644
--- a/app/Listeners/Activity/TaskDeletedActivity.php
+++ b/app/Listeners/Activity/TaskDeletedActivity.php
@@ -43,7 +43,7 @@ class TaskDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->task->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/TaskRestoredActivity.php b/app/Listeners/Activity/TaskRestoredActivity.php
index 3a32c1cee49c..c46708dc3988 100644
--- a/app/Listeners/Activity/TaskRestoredActivity.php
+++ b/app/Listeners/Activity/TaskRestoredActivity.php
@@ -43,7 +43,7 @@ class TaskRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->task->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/TaskUpdatedActivity.php b/app/Listeners/Activity/TaskUpdatedActivity.php
index 2a7e7ded6680..d9071942d515 100644
--- a/app/Listeners/Activity/TaskUpdatedActivity.php
+++ b/app/Listeners/Activity/TaskUpdatedActivity.php
@@ -45,7 +45,7 @@ class TaskUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $task->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/UpdatedCreditActivity.php b/app/Listeners/Activity/UpdatedCreditActivity.php
index 9dade670b800..a087c886a430 100644
--- a/app/Listeners/Activity/UpdatedCreditActivity.php
+++ b/app/Listeners/Activity/UpdatedCreditActivity.php
@@ -43,7 +43,7 @@ class UpdatedCreditActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;
diff --git a/app/Listeners/Activity/VendorArchivedActivity.php b/app/Listeners/Activity/VendorArchivedActivity.php
index 85422b3ae8a0..8c9800d1e615 100644
--- a/app/Listeners/Activity/VendorArchivedActivity.php
+++ b/app/Listeners/Activity/VendorArchivedActivity.php
@@ -45,7 +45,7 @@ class VendorArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $vendor->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/VendorDeletedActivity.php b/app/Listeners/Activity/VendorDeletedActivity.php
index fd796509c5c0..841fbb5d6b49 100644
--- a/app/Listeners/Activity/VendorDeletedActivity.php
+++ b/app/Listeners/Activity/VendorDeletedActivity.php
@@ -43,7 +43,7 @@ class VendorDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/VendorRestoredActivity.php b/app/Listeners/Activity/VendorRestoredActivity.php
index 02d86dac2840..00be591feaec 100644
--- a/app/Listeners/Activity/VendorRestoredActivity.php
+++ b/app/Listeners/Activity/VendorRestoredActivity.php
@@ -43,7 +43,7 @@ class VendorRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Activity/VendorUpdatedActivity.php b/app/Listeners/Activity/VendorUpdatedActivity.php
index a39d599b063d..84ce2ff06ecd 100644
--- a/app/Listeners/Activity/VendorUpdatedActivity.php
+++ b/app/Listeners/Activity/VendorUpdatedActivity.php
@@ -45,7 +45,7 @@ class VendorUpdatedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $vendor->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Credit/CreditRestoredActivity.php b/app/Listeners/Credit/CreditRestoredActivity.php
index c2806e4b4255..33e218c480b3 100644
--- a/app/Listeners/Credit/CreditRestoredActivity.php
+++ b/app/Listeners/Credit/CreditRestoredActivity.php
@@ -43,7 +43,7 @@ class CreditRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;
diff --git a/app/Listeners/Credit/CreditViewedActivity.php b/app/Listeners/Credit/CreditViewedActivity.php
index 9518936aea87..6ba722d88aa0 100644
--- a/app/Listeners/Credit/CreditViewedActivity.php
+++ b/app/Listeners/Credit/CreditViewedActivity.php
@@ -45,7 +45,7 @@ class CreditViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->user_id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->invitation->company_id;
diff --git a/app/Listeners/Invoice/CreateInvoiceActivity.php b/app/Listeners/Invoice/CreateInvoiceActivity.php
index f5baea05f0ea..de8c5a2ecda8 100644
--- a/app/Listeners/Invoice/CreateInvoiceActivity.php
+++ b/app/Listeners/Invoice/CreateInvoiceActivity.php
@@ -45,7 +45,7 @@ class CreateInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceArchivedActivity.php b/app/Listeners/Invoice/InvoiceArchivedActivity.php
index 32b9d8d979d4..f0f84536f56f 100644
--- a/app/Listeners/Invoice/InvoiceArchivedActivity.php
+++ b/app/Listeners/Invoice/InvoiceArchivedActivity.php
@@ -45,7 +45,7 @@ class InvoiceArchivedActivity implements ShouldQueue
         
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/Invoice/InvoiceCancelledActivity.php b/app/Listeners/Invoice/InvoiceCancelledActivity.php
index 6a77f69b3d2b..3a9589505ca0 100644
--- a/app/Listeners/Invoice/InvoiceCancelledActivity.php
+++ b/app/Listeners/Invoice/InvoiceCancelledActivity.php
@@ -45,7 +45,7 @@ class InvoiceCancelledActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceDeletedActivity.php b/app/Listeners/Invoice/InvoiceDeletedActivity.php
index b16b168f0ea8..10f8a36c8211 100644
--- a/app/Listeners/Invoice/InvoiceDeletedActivity.php
+++ b/app/Listeners/Invoice/InvoiceDeletedActivity.php
@@ -45,7 +45,7 @@ class InvoiceDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php
index 5969ef97877b..6798fc9a02b0 100644
--- a/app/Listeners/Invoice/InvoiceEmailActivity.php
+++ b/app/Listeners/Invoice/InvoiceEmailActivity.php
@@ -45,7 +45,7 @@ class InvoiceEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
index 9d05e1c2d70c..099c32afe86a 100644
--- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
+++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
@@ -49,7 +49,7 @@ class InvoiceEmailFailedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php
index f942b867a3ee..bc1bd772d9b9 100644
--- a/app/Listeners/Invoice/InvoicePaidActivity.php
+++ b/app/Listeners/Invoice/InvoicePaidActivity.php
@@ -45,11 +45,12 @@ class InvoicePaidActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->payment->client_id;
+        $fields->client_contact_id = $event->payment->client_contact_id ?? null;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::PAID_INVOICE;
         $fields->payment_id = $event->payment->id;
diff --git a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
index 9fce655b838b..edda3ab45a96 100644
--- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
+++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
@@ -44,7 +44,7 @@ class InvoiceReminderEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $reminder = match($event->template) {
             'reminder1' => 63,
diff --git a/app/Listeners/Invoice/InvoiceRestoredActivity.php b/app/Listeners/Invoice/InvoiceRestoredActivity.php
index 16ba7903058b..7fc21827ebf1 100644
--- a/app/Listeners/Invoice/InvoiceRestoredActivity.php
+++ b/app/Listeners/Invoice/InvoiceRestoredActivity.php
@@ -45,7 +45,7 @@ class InvoiceRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceReversedActivity.php b/app/Listeners/Invoice/InvoiceReversedActivity.php
index 324ccfc2b56f..dce3793fa62f 100644
--- a/app/Listeners/Invoice/InvoiceReversedActivity.php
+++ b/app/Listeners/Invoice/InvoiceReversedActivity.php
@@ -45,7 +45,7 @@ class InvoiceReversedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
diff --git a/app/Listeners/Invoice/InvoiceViewedActivity.php b/app/Listeners/Invoice/InvoiceViewedActivity.php
index 0fbe63c4b570..2cf405be758a 100644
--- a/app/Listeners/Invoice/InvoiceViewedActivity.php
+++ b/app/Listeners/Invoice/InvoiceViewedActivity.php
@@ -45,7 +45,7 @@ class InvoiceViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $event->invitation->invoice->service()->markSent()->save();
 
diff --git a/app/Listeners/Invoice/UpdateInvoiceActivity.php b/app/Listeners/Invoice/UpdateInvoiceActivity.php
index 19c574c8f585..d1966b8d6784 100644
--- a/app/Listeners/Invoice/UpdateInvoiceActivity.php
+++ b/app/Listeners/Invoice/UpdateInvoiceActivity.php
@@ -43,7 +43,7 @@ class UpdateInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->invoice->client_id;
diff --git a/app/Listeners/Payment/PaymentEmailedActivity.php b/app/Listeners/Payment/PaymentEmailedActivity.php
index db5698a58e26..4c29ae37fec5 100644
--- a/app/Listeners/Payment/PaymentEmailedActivity.php
+++ b/app/Listeners/Payment/PaymentEmailedActivity.php
@@ -41,7 +41,7 @@ class PaymentEmailedActivity implements ShouldQueue
 
         $fields = new \stdClass();
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->payment->client_id;
diff --git a/app/Listeners/Payment/PaymentRestoredActivity.php b/app/Listeners/Payment/PaymentRestoredActivity.php
index e4e709e7b0b9..b212faa79463 100644
--- a/app/Listeners/Payment/PaymentRestoredActivity.php
+++ b/app/Listeners/Payment/PaymentRestoredActivity.php
@@ -45,7 +45,7 @@ class PaymentRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->user_id = $user_id;
         $fields->payment_id = $event->payment->id;
diff --git a/app/Listeners/PurchaseOrder/CreatePurchaseOrderActivity.php b/app/Listeners/PurchaseOrder/CreatePurchaseOrderActivity.php
index 404d8affc0d6..d0896677870c 100644
--- a/app/Listeners/PurchaseOrder/CreatePurchaseOrderActivity.php
+++ b/app/Listeners/PurchaseOrder/CreatePurchaseOrderActivity.php
@@ -45,7 +45,7 @@ class CreatePurchaseOrderActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
index 01aa71a64030..4e452d835965 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderAcceptedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $event->purchase_order->service()->markSent()->save();
 
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
index f4401078ac52..cb7860f39ea7 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
index c606287ae91d..3d989afa7fc6 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php
index e10dd2240305..0c2fb25a4869 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->invitation->purchase_order->id;
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
index 1d7e856ba158..2464a45af535 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
index a541d6aac18e..79471a064059 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
@@ -45,7 +45,7 @@ class PurchaseOrderViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
 
         $event->invitation->purchase_order->service()->markSent()->save();
 
diff --git a/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php b/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
index eb1eeae12431..e4b9efb1bad8 100644
--- a/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
+++ b/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
@@ -45,7 +45,7 @@ class UpdatePurchaseOrderActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->vendor_id = $event->purchase_order->vendor_id;
diff --git a/app/Listeners/Quote/QuoteApprovedActivity.php b/app/Listeners/Quote/QuoteApprovedActivity.php
index 3c12a948c4b6..18d7933d5b9f 100644
--- a/app/Listeners/Quote/QuoteApprovedActivity.php
+++ b/app/Listeners/Quote/QuoteApprovedActivity.php
@@ -45,7 +45,7 @@ class QuoteApprovedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
diff --git a/app/Listeners/Quote/QuoteArchivedActivity.php b/app/Listeners/Quote/QuoteArchivedActivity.php
index b207b8637f8e..7c50be635422 100644
--- a/app/Listeners/Quote/QuoteArchivedActivity.php
+++ b/app/Listeners/Quote/QuoteArchivedActivity.php
@@ -45,7 +45,7 @@ class QuoteArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
diff --git a/app/Listeners/Quote/QuoteDeletedActivity.php b/app/Listeners/Quote/QuoteDeletedActivity.php
index 8126532f50ee..9565687ca100 100644
--- a/app/Listeners/Quote/QuoteDeletedActivity.php
+++ b/app/Listeners/Quote/QuoteDeletedActivity.php
@@ -45,7 +45,7 @@ class QuoteDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;
diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php
index 192e36c1aa97..f08666703023 100644
--- a/app/Listeners/Quote/QuoteEmailActivity.php
+++ b/app/Listeners/Quote/QuoteEmailActivity.php
@@ -45,7 +45,7 @@ class QuoteEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/Quote/QuoteRestoredActivity.php b/app/Listeners/Quote/QuoteRestoredActivity.php
index 8a424a346e0f..48ecb7bc22a9 100644
--- a/app/Listeners/Quote/QuoteRestoredActivity.php
+++ b/app/Listeners/Quote/QuoteRestoredActivity.php
@@ -45,7 +45,7 @@ class QuoteRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->quote->client_id;
diff --git a/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php b/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
index 3ccf67569ebf..29e4d60a2483 100644
--- a/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
+++ b/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
@@ -45,7 +45,7 @@ class CreatedRecurringExpenseActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $recurring_expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php b/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
index d7168b965297..fba583ca9610 100644
--- a/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
+++ b/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
@@ -45,7 +45,7 @@ class RecurringExpenseArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $recurring_expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/RecurringExpense/RecurringExpenseDeletedActivity.php b/app/Listeners/RecurringExpense/RecurringExpenseDeletedActivity.php
index 5c847d8d7e68..45912f5c27ea 100644
--- a/app/Listeners/RecurringExpense/RecurringExpenseDeletedActivity.php
+++ b/app/Listeners/RecurringExpense/RecurringExpenseDeletedActivity.php
@@ -43,7 +43,7 @@ class RecurringExpenseDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $event->recurring_expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/RecurringExpense/RecurringExpenseRestoredActivity.php b/app/Listeners/RecurringExpense/RecurringExpenseRestoredActivity.php
index 0abc78cb5c77..7abb0efea279 100644
--- a/app/Listeners/RecurringExpense/RecurringExpenseRestoredActivity.php
+++ b/app/Listeners/RecurringExpense/RecurringExpenseRestoredActivity.php
@@ -43,7 +43,7 @@ class RecurringExpenseRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $event->recurring_expense->id;
         $fields->user_id = $user_id;
diff --git a/app/Listeners/RecurringExpense/RecurringExpenseUpdatedActivity.php b/app/Listeners/RecurringExpense/RecurringExpenseUpdatedActivity.php
index aac1166c75e3..789bdf594538 100644
--- a/app/Listeners/RecurringExpense/RecurringExpenseUpdatedActivity.php
+++ b/app/Listeners/RecurringExpense/RecurringExpenseUpdatedActivity.php
@@ -43,7 +43,7 @@ class RecurringExpenseUpdatedActivity implements ShouldQueue
 
         $recurring_expense = $event->recurring_expense;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields = new stdClass;
 
diff --git a/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php b/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php
index 23b8e863a4b3..7f2f4e41c95d 100644
--- a/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php
+++ b/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php
@@ -43,7 +43,7 @@ class CreateRecurringInvoiceActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
index 9b927ba62879..f061469e1829 100644
--- a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
+++ b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
@@ -44,7 +44,7 @@ class RecurringInvoiceArchivedActivity implements ShouldQueue
         $event->recurring_invoice->service()->deletePdf();
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php
index 905407ce52ba..92359878cf27 100644
--- a/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php
+++ b/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php
@@ -42,7 +42,7 @@ class RecurringInvoiceDeletedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php
index 490a0dca72da..ba4aca902028 100644
--- a/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php
+++ b/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php
@@ -42,7 +42,7 @@ class RecurringInvoiceRestoredActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;
diff --git a/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php b/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php
index 5a591195b719..7795c13c6391 100644
--- a/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php
+++ b/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php
@@ -42,7 +42,7 @@ class UpdateRecurringInvoiceActivity implements ShouldQueue
         MultiDB::setDB($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->recurring_invoice->client_id;
diff --git a/app/Listeners/RecurringQuote/CreateRecurringQuoteActivity.php b/app/Listeners/RecurringQuote/CreateRecurringQuoteActivity.php
index e9cabfba887e..3d6684c00291 100644
--- a/app/Listeners/RecurringQuote/CreateRecurringQuoteActivity.php
+++ b/app/Listeners/RecurringQuote/CreateRecurringQuoteActivity.php
@@ -43,7 +43,7 @@ class CreateRecurringQuoteActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;
diff --git a/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php b/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
index 1d46b4b077eb..c6f9683a78eb 100644
--- a/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
+++ b/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
@@ -44,7 +44,7 @@ class RecurringQuoteArchivedActivity implements ShouldQueue
         $event->recurring_quote->service()->deletePdf();
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;
diff --git a/app/Listeners/RecurringQuote/RecurringQuoteDeletedActivity.php b/app/Listeners/RecurringQuote/RecurringQuoteDeletedActivity.php
index 0ad3872d939c..429c7bcc1b83 100644
--- a/app/Listeners/RecurringQuote/RecurringQuoteDeletedActivity.php
+++ b/app/Listeners/RecurringQuote/RecurringQuoteDeletedActivity.php
@@ -42,7 +42,7 @@ class RecurringQuoteDeletedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;
diff --git a/app/Listeners/RecurringQuote/RecurringQuoteRestoredActivity.php b/app/Listeners/RecurringQuote/RecurringQuoteRestoredActivity.php
index 08e72c8528d9..9cda335337d3 100644
--- a/app/Listeners/RecurringQuote/RecurringQuoteRestoredActivity.php
+++ b/app/Listeners/RecurringQuote/RecurringQuoteRestoredActivity.php
@@ -42,7 +42,7 @@ class RecurringQuoteRestoredActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;
diff --git a/app/Listeners/RecurringQuote/UpdateRecurringQuoteActivity.php b/app/Listeners/RecurringQuote/UpdateRecurringQuoteActivity.php
index 9d77129e8176..0024147aab16 100644
--- a/app/Listeners/RecurringQuote/UpdateRecurringQuoteActivity.php
+++ b/app/Listeners/RecurringQuote/UpdateRecurringQuoteActivity.php
@@ -42,7 +42,7 @@ class UpdateRecurringQuoteActivity implements ShouldQueue
         MultiDB::setDB($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->recurring_quote->client_id;
diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php
index 3e4a7bf37213..1e9ce0f1d215 100644
--- a/app/Listeners/User/ArchivedUserActivity.php
+++ b/app/Listeners/User/ArchivedUserActivity.php
@@ -43,7 +43,7 @@ class ArchivedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php
index 892ded9761a6..db8b6a2236e4 100644
--- a/app/Listeners/User/CreatedUserActivity.php
+++ b/app/Listeners/User/CreatedUserActivity.php
@@ -43,7 +43,7 @@ class CreatedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->company->id;
diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php
index 85a19f48ac54..8c2841daa8de 100644
--- a/app/Listeners/User/DeletedUserActivity.php
+++ b/app/Listeners/User/DeletedUserActivity.php
@@ -48,7 +48,7 @@ class DeletedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->company->id;
diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php
index 272cdaf59648..b75047c8986b 100644
--- a/app/Listeners/User/RestoredUserActivity.php
+++ b/app/Listeners/User/RestoredUserActivity.php
@@ -42,7 +42,7 @@ class RestoredUserActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php
index 07770f4ac760..b3d2466a22c9 100644
--- a/app/Listeners/User/UpdatedUserActivity.php
+++ b/app/Listeners/User/UpdatedUserActivity.php
@@ -42,7 +42,7 @@ class UpdatedUserActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 57ac9fc7c8a1..6fe2e2ac5c71 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -410,6 +410,12 @@ class Activity extends StaticModel
 
         $found_variables = array_intersect(explode(" ", trans("texts.activity_{$this->activity_type_id}")), $intersect);
 
+        if($this->activity_type_id == 10 && $this->client_contact_id && !$this->token_id)
+            $found_variables = array_intersect(explode(" ", trans("texts.activity_10_online")), $intersect);
+
+        if($this->activity_type_id == 54 && !$this->token_id)
+            array_push($found_variables, ':contact');
+
         $replacements = [];
 
         foreach($found_variables as $var) {
@@ -475,6 +481,10 @@ class Activity extends StaticModel
 
         $contact_entity = $this->contact ? 'clients' : 'vendors';
 
+        if(!$contact) {
+            return [];
+        }
+        
         return ['contact' => [ 'label' => $contact?->present()->name() ?? '', 'hashed_id' => $entity->hashed_id ?? '', 'contact_entity' => $contact_entity]];
     }
 }
diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php
index d25f23ed4aaf..5a788bb44a7a 100644
--- a/app/Utils/Ninja.php
+++ b/app/Utils/Ninja.php
@@ -132,7 +132,7 @@ class Ninja
             'ip' => $ip,
             'token' => request()->header('X-API-TOKEN'),
             'is_system' => app()->runningInConsole(),
-            'user_id' => ($ip == '127.0.0.1') ? null : $user_id,
+            'user_id' => (app()->runningInConsole() && $ip == '127.0.0.1') ? null : $user_id,
         ];
     }
 
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 86600fde6d47..151691988459 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5134,7 +5134,7 @@ $lang = array(
     'region' => 'Region',
     'county' => 'County',
     'tax_details' => 'Tax Details',
-    'activity_10_online' => ':contact entered payment :payment for invoice :invoice for :client',
+    'activity_10_online' => ':contact made payment :payment for invoice :invoice for :client',
     'activity_10_manual' => ':user entered payment :payment for invoice :invoice for :client',
     'default_payment_type' => 'Default Payment Type',
     'number_precision' => 'Number precision',