diff --git a/app/Filament/Organizations/Resources/UserResource.php b/app/Filament/Organizations/Resources/UserResource.php
index b3b1b03d..33c55cd9 100644
--- a/app/Filament/Organizations/Resources/UserResource.php
+++ b/app/Filament/Organizations/Resources/UserResource.php
@@ -133,7 +133,8 @@ public static function getSchema(): array
                         ->email()
                         ->unique(
                             ignoreRecord: true,
-                            modifyRuleUsing: fn (Unique $rule) => $rule->whereIn('id', User::getTenantOrganizationUsers()->keys())
+                            modifyRuleUsing: fn (Unique $rule, string $operation) => $operation === 'edit' ? $rule :
+                                $rule->whereIn('id', User::getTenantOrganizationUsers()->keys())
                         )
                         ->required(),