diff --git a/app/Modules/Admin/Views/users/edit.blade.php b/app/Modules/Admin/Views/users/edit.blade.php
index 38f9a83..812b36f 100644
--- a/app/Modules/Admin/Views/users/edit.blade.php
+++ b/app/Modules/Admin/Views/users/edit.blade.php
@@ -51,14 +51,14 @@
                             @if($userRole->role->id == $roles::COMPANY_ADMIN)
                             <div class="fs-6 hstack gap-1">
                                 @foreach($companyAdmins as $admin) 
-                                <span class="badge text-bg-secondary">{{ $admin->company->name }}</span>
+                                <span class="badge text-bg-secondary">{{ $admin->company?->name }}</span>
                                 @endforeach
                             </div>
                             @endif
                             @if($userRole->role->id == $roles::AGENT)
                             <div class="fs-6 hstack gap-1">
                                 @foreach($companyAgents as $agent) 
-                                <span class="badge text-bg-secondary">{{ $agent->company->name }}</span>
+                                <span class="badge text-bg-secondary">{{ $agent->company?->name }}</span>
                                 @endforeach
                             </div>
                             @endif
diff --git a/app/Modules/User/Models/UserRole.php b/app/Modules/User/Models/UserRole.php
index 4ad17ad..1798327 100644
--- a/app/Modules/User/Models/UserRole.php
+++ b/app/Modules/User/Models/UserRole.php
@@ -7,6 +7,10 @@
 use Modules\User\Models\User;
 use Modules\User\Models\Role;
 
+use Modules\Main\Models\Company\CompanyAdmin;
+use Modules\Main\Models\Agent\Agent;
+use Modules\CityManager\Models\CityManager;
+
 class UserRole extends Model
 {
     use HasFactory;
@@ -24,4 +28,23 @@ public static function create(array $attributes = [])
     {
         return parent::updateOrCreate($attributes);
     }
+
+    protected static function booted()
+    {
+        static::deleted(function (UserRole $userRole)
+        {
+            $userId = $userRole->user_id;
+            switch ($userRole->role_id) {
+                case Role::AGENT :
+                    Agent::where('user_id', $userId)->delete();
+                    break;
+                case Role::COMPANY_ADMIN :
+                    CompanyAdmin::where('user_id', $userId)->delete();
+                    break;
+                case Role::CITY_MANAGER :
+                    CityManager::where('user_id', $userId)->delete();
+                    break;
+            }
+        });
+    }
 }