diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php
index 79e236d70fc6..9d005bcc41e7 100644
--- a/app/Http/Controllers/PublicClientController.php
+++ b/app/Http/Controllers/PublicClientController.php
@@ -323,7 +323,7 @@ class PublicClientController extends BaseController
             ->addColumn('activity_type_id', function ($model) {
                 $data = [
                     'client' => Utils::getClientDisplayName($model),
-                    'user' => $model->is_system ? ('<i>' . trans('texts.system') . '</i>') : ($model->user_first_name . ' ' . $model->user_last_name),
+                    'user' => $model->is_system ? ('<i>' . trans('texts.system') . '</i>') : ($model->account_name),
                     'invoice' => $model->invoice,
                     'contact' => Utils::getClientDisplayName($model),
                     'payment' => $model->payment ? ' ' . $model->payment : '',
diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php
index 60474dc9580d..d0ea33981117 100644
--- a/app/Ninja/Repositories/ActivityRepository.php
+++ b/app/Ninja/Repositories/ActivityRepository.php
@@ -91,6 +91,7 @@ class ActivityRepository
                         'invoices.public_id as invoice_public_id',
                         'invoices.is_recurring',
                         'clients.name as client_name',
+                        'accounts.name as account_name',
                         'clients.public_id as client_public_id',
                         'contacts.id as contact',
                         'contacts.first_name as first_name',
@@ -102,4 +103,4 @@ class ActivityRepository
                     );
     }
 
-}
\ No newline at end of file
+}