diff --git a/app/Filament/Admin/Resources/UserResource.php b/app/Filament/Admin/Resources/UserResource.php
index 4d694dd30..1664a5470 100644
--- a/app/Filament/Admin/Resources/UserResource.php
+++ b/app/Filament/Admin/Resources/UserResource.php
@@ -105,14 +105,14 @@ class UserResource extends Resource
                     ->label(trans('admin/user.username'))
                     ->alphaNum()
                     ->required()
-                    ->unique()
+                    ->unique(ignoreRecord: true)
                     ->minLength(3)
                     ->maxLength(255),
                 TextInput::make('email')
                     ->label(trans('admin/user.email'))
                     ->email()
                     ->required()
-                    ->unique()
+                    ->unique(ignoreRecord: true)
                     ->maxLength(255),
                 TextInput::make('password')
                     ->label(trans('admin/user.password'))
diff --git a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php b/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php
index 67d8e6d41..ea594ea55 100644
--- a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php
+++ b/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php
@@ -41,6 +41,8 @@ class EditUser extends EditRecord
             return $record;
         }
 
+        unset($data['roles']);
+
         return $this->service->handle($record, $data);
     }
 }