diff --git a/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php b/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php
index c020a1e66..2c238b425 100644
--- a/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php
+++ b/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php
@@ -42,7 +42,7 @@ class ListActivities extends ListRecords
                 TextColumn::make('user')
                     ->state(function (ActivityLog $activityLog) use ($server) {
                         if (!$activityLog->actor instanceof User) {
-                            return 'System';
+                            return $activityLog->actor_id === null ? 'System' : 'Deleted user';
                         }
 
                         $user = $activityLog->actor->username;
@@ -72,7 +72,7 @@ class ListActivities extends ListRecords
                         TextInput::make('user')
                             ->formatStateUsing(function (ActivityLog $activityLog) use ($server) {
                                 if (!$activityLog->actor instanceof User) {
-                                    return 'System';
+                                    return $activityLog->actor_id === null ? 'System' : 'Deleted user';
                                 }
 
                                 $user = $activityLog->actor->username;
diff --git a/app/Models/ActivityLog.php b/app/Models/ActivityLog.php
index c4c9e39b5..1e666c9f9 100644
--- a/app/Models/ActivityLog.php
+++ b/app/Models/ActivityLog.php
@@ -153,7 +153,11 @@ class ActivityLog extends Model implements HasIcon, HasLabel
             return 'tabler-api';
         }
 
-        return $this->actor instanceof User ? 'tabler-user' : 'tabler-device-desktop';
+        if ($this->actor instanceof User) {
+            return 'tabler-user';
+        }
+
+        return $this->actor_id === null ? 'tabler-device-desktop' : 'tabler-user-off';
     }
 
     public function getLabel(): string