diff --git a/app/Filament/Resources/Users/Schemas/UserForm.php b/app/Filament/Resources/Users/Schemas/UserForm.php
index bc266f7..e7f23d4 100644
--- a/app/Filament/Resources/Users/Schemas/UserForm.php
+++ b/app/Filament/Resources/Users/Schemas/UserForm.php
@@ -49,16 +49,14 @@ class UserForm
                     ->relationship('roles', 'name')
                     ->multiple()
                     ->preload()
-                    ->native(false)
-                    ->required(),
+                    ->native(false),
 
                 Select::make('branches')
                     ->label(__('Branches'))
                     ->relationship('branches', 'name', fn (Builder $query) => $query->distinct('id')->orderBy('id'))
                     ->multiple()
                     ->preload()
-                    ->native(false)
-                    ->required(),
+                    ->native(false),
             ]);
     }
 }
diff --git a/app/Modules/BaseAuth/Controllers/LoginController.php b/app/Modules/BaseAuth/Controllers/LoginController.php
index 5a014da..e862655 100644
--- a/app/Modules/BaseAuth/Controllers/LoginController.php
+++ b/app/Modules/BaseAuth/Controllers/LoginController.php
@@ -159,6 +159,10 @@ class LoginController extends Controller
                 $request->session()->put('auth.password_confirmed_at', time());
             }
 
+            if ($user->roles->count() == 0) {
+                $user->assignRole('client');
+            }
+
             return $this->sendLoginResponse($request);
         }
 
diff --git a/app/Modules/BaseAuth/Controllers/RegisterController.php b/app/Modules/BaseAuth/Controllers/RegisterController.php
index 0ab21fb..ed3c05c 100644
--- a/app/Modules/BaseAuth/Controllers/RegisterController.php
+++ b/app/Modules/BaseAuth/Controllers/RegisterController.php
@@ -110,6 +110,8 @@ class RegisterController extends Controller
             'must_fill_profile' => true,
         ]);
 
+        $user->assignRole('client');
+
         return $user;
     }
 
diff --git a/app/Modules/UserAdjustments/Traits/RoleCheckers.php b/app/Modules/UserAdjustments/Traits/RoleCheckers.php
index 02f752c..73fedae 100644
--- a/app/Modules/UserAdjustments/Traits/RoleCheckers.php
+++ b/app/Modules/UserAdjustments/Traits/RoleCheckers.php
@@ -57,6 +57,6 @@ trait RoleCheckers
      */
     public function isSystemUser(): bool
     {
-        return $this->roles->count() > 0;
+        return $this->hasAnyRole();
     }
 }