diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index 7353b08a3..5cb82c35b 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -14,7 +14,6 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Facades\Hash;
-
 class UserResource extends Resource
 {
     protected static ?string $model = User::class;
@@ -29,6 +28,7 @@ class UserResource extends Resource
             ->schema([
                 Forms\Components\TextInput::make('name')
                     ->required()
+                    ->autofocus()
                     ->reactive()
                     ->afterStateUpdated(function ($state, callable $set, callable $get) {
                         $set('email', $state . '@cripumps.com');
@@ -36,8 +36,13 @@ class UserResource extends Resource
                     ->maxLength(255),
                 Forms\Components\TextInput::make('email')
                     // ->email()
+                    ->unique(ignoreRecord: true)
                     ->required()
                     ->readOnly()
+                    // ->rule(function (callable $get) {
+                    //     return Rule::unique('users', 'email')
+                    //         ->ignore($get('id')); // Ignore current record during updates
+                    // })
                     ->reactive()
                     //->prefix(fn ($get) => $get('name') ?? null)
                     // ->suffix('@cripumps.com')
@@ -61,6 +66,9 @@ class UserResource extends Resource
                     ->multiple()
                     ->preload()
                     ->searchable(),
+                Forms\Components\TextInput::make('id')
+                    ->hidden()
+                    ->readOnly(),
             ]);
     }