diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 0ce25da..28ee488 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -161,6 +161,11 @@
             $user = User::find($id);
             $user->update($request->all());
 
+            if ($request->roles) {
+                $user->roles()->detach();
+                $user->assignRole($request->roles);
+            }
+
             return redirect()->route('users.index')->with('success', 'User updated successfully.');
         }
 
@@ -223,6 +228,10 @@
                 $user = User::create($validated);
 
                 if ($user) {
+                    if ($request->roles) {
+                        $user->assignRole($request->roles);
+                    }
+
                     return redirect()->route('users.index')->with('success', 'User created successfully.');
                 }
             }
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 2e9f743..8fb93bc 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -9,129 +9,171 @@
         @if(isset($user->id))
             <form action="{{ route('users.update', $user->id) }}" method="POST">
                 <input type="hidden" name="id" value="{{ $user->id }}">
-            @method('PUT')
-        @else
-            <form method="POST" action="{{ route('users.store') }}">
-        @endif
-        @csrf
-            <div class="card pb-2.5">
-                <div class="card-header" id="basic_settings">
-                    <h3 class="card-title">
-                        {{ isset($user->id) ? 'Edit' : 'Add' }} User
-                    </h3>
-                    <div class="flex items-center gap-2">
-                        <label class="switch switch-sm">
-                            <span class="switch-label">
-                                Public Profile
-                            </span>
-                            <input checked="" name="check" type="checkbox" value="1">
-                        </label>
-                    </div>
-                </div>
-                <div class="card-body grid gap-5">
-
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Name
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('name') border-danger @enderror" type="text" name="name" value="{{ $user->name ?? '' }}">
-                            @error('name')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Email
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="w-full input @error('email') border-danger @enderror" type="email" name="email" value="{{ $user->email ?? '' }}">
-                            @error('email')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            NIK
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="w-full input @error('nik') border-danger @enderror" type="number" name="nik" value="{{ $user->nik ?? '' }}">
-                            @error('nik')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Branch
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full @error('branch_id') border-danger @enderror" name="branch_id" id="branch_id">
-                                <option value="">Pilih Branch</option>
-                                @if(isset($branches))
-                                    @foreach($branches as $row)
-                                        @if(isset($user))
-                                            <option value="{{ $row->id }}" {{ isset($user->branch_id) && $user->branch_id == $row->id?'selected' : '' }}>
-                                                {{ $row->name }}
-                                            </option>
-                                        @else
-                                            <option value="{{ $row->id }}">
-                                                {{ $row->name }}
-                                            </option>
-                                        @endif
-                                    @endforeach
-                                @endif
-                            </select>
-                            @error('branch_id')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Password
-                        </label>
-
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <div class="input @error('password') border-danger @enderror" data-toggle-password="true" data-toggle-password-permanent="true">
-                                <input placeholder="Password" type="password" name="password"/>
-                                <div class="btn btn-icon" data-toggle-password-trigger="true">
-                                    <i class="ki-outline ki-eye toggle-password-active:hidden"></i>
-                                    <i class="ki-outline ki-eye-slash hidden toggle-password-active:block"></i>
+                @method('PUT')
+                @else
+                    <form method="POST" action="{{ route('users.store') }}">
+                        @endif
+                        @csrf
+                        <div class="card pb-2.5">
+                            <div class="card-header" id="basic_settings">
+                                <h3 class="card-title">
+                                    {{ isset($user->id) ? 'Edit' : 'Add' }} User
+                                </h3>
+                                <div class="flex items-center gap-2">
+                                    <label class="switch switch-sm">
+                                        <span class="switch-label">
+                                            Public Profile
+                                        </span>
+                                        <input checked="" name="check" type="checkbox" value="1">
+                                    </label>
                                 </div>
                             </div>
-                            @error('password')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Password Confirmation
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <div class="input @error('password_confirmation') border-danger @enderror" data-toggle-password="true" data-toggle-password-permanent="true">
-                                <input placeholder="Password Confirmation" type="password" name="password_confirmation"/>
-                                <div class="btn btn-icon" data-toggle-password-trigger="true">
-                                    <i class="ki-outline ki-eye toggle-password-active:hidden"></i>
-                                    <i class="ki-outline ki-eye-slash hidden toggle-password-active:block"></i>
+                            <div class="card-body grid gap-5">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Name
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('name') border-danger @enderror" type="text" name="name" value="{{ $user->name ?? '' }}">
+                                        @error('name')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Email
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="w-full input @error('email') border-danger @enderror" type="email" name="email" value="{{ $user->email ?? '' }}">
+                                        @error('email')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        NIK
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="w-full input @error('nik') border-danger @enderror" type="number" name="nik" value="{{ $user->nik ?? '' }}">
+                                        @error('nik')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Branch
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select class="input tomselect w-full @error('branch_id') border-danger @enderror" name="branch_id" id="branch_id">
+                                            <option value="">Pilih Branch</option>
+                                            @if(isset($branches))
+                                                @foreach($branches as $row)
+                                                    @if(isset($user))
+                                                        <option value="{{ $row->id }}" {{ isset($user->branch_id) && $user->branch_id == $row->id?'selected' : '' }}>
+                                                            {{ $row->name }}
+                                                        </option>
+                                                    @else
+                                                        <option value="{{ $row->id }}">
+                                                            {{ $row->name }}
+                                                        </option>
+                                                    @endif
+                                                @endforeach
+                                            @endif
+                                        </select>
+                                        @error('branch_id')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Password
+                                    </label>
+
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <div class="input @error('password') border-danger @enderror" data-toggle-password="true" data-toggle-password-permanent="true">
+                                            <input placeholder="Password" type="password" name="password"/>
+                                            <div class="btn btn-icon" data-toggle-password-trigger="true">
+                                                <i class="ki-outline ki-eye toggle-password-active:hidden"></i>
+                                                <i class="ki-outline ki-eye-slash hidden toggle-password-active:block"></i>
+                                            </div>
+                                        </div>
+                                        @error('password')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Password Confirmation
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <div class="input @error('password_confirmation') border-danger @enderror" data-toggle-password="true" data-toggle-password-permanent="true">
+                                            <input placeholder="Password Confirmation" type="password" name="password_confirmation"/>
+                                            <div class="btn btn-icon" data-toggle-password-trigger="true">
+                                                <i class="ki-outline ki-eye toggle-password-active:hidden"></i>
+                                                <i class="ki-outline ki-eye-slash hidden toggle-password-active:block"></i>
+                                            </div>
+                                        </div>
+                                        @error('password_confirmation')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Role
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <div class="grid grid-cols-1 lg:grid-cols-2 gap-5 py-5 lg:py-7.5 w-full">
+                                            @foreach($roles as $role)
+                                                <div class="rounded-xl border p-4 flex items-center justify-between gap-2.5">
+                                                    <div class="flex items-center gap-3.5">
+                                                        <div class="relative size-[45px] shrink-0">
+                                                            <svg class="w-full h-full stroke-gray-300 fill-gray-100" fill="none" height="48" viewBox="0 0 44 48" width="44" xmlns="http://www.w3.org/2000/svg">
+                                                                <path d="M16 2.4641C19.7128 0.320509 24.2872 0.320508 28 2.4641L37.6506 8.0359C41.3634 10.1795 43.6506 14.141 43.6506
+			18.4282V29.5718C43.6506 33.859 41.3634 37.8205 37.6506 39.9641L28 45.5359C24.2872 47.6795 19.7128 47.6795 16 45.5359L6.34937
+			39.9641C2.63655 37.8205 0.349365 33.859 0.349365 29.5718V18.4282C0.349365 14.141 2.63655 10.1795 6.34937 8.0359L16 2.4641Z" fill="">
+                                                                </path>
+                                                                <path d="M16.25 2.89711C19.8081 0.842838 24.1919 0.842837 27.75 2.89711L37.4006 8.46891C40.9587 10.5232 43.1506 14.3196 43.1506
+			18.4282V29.5718C43.1506 33.6804 40.9587 37.4768 37.4006 39.5311L27.75 45.1029C24.1919 47.1572 19.8081 47.1572 16.25 45.1029L6.59937
+			39.5311C3.04125 37.4768 0.849365 33.6803 0.849365 29.5718V18.4282C0.849365 14.3196 3.04125 10.5232 6.59937 8.46891L16.25 2.89711Z" stroke="">
+                                                                </path>
+                                                            </svg>
+                                                            <div class="absolute leading-none left-2/4 top-2/4 -translate-y-2/4 -translate-x-2/4">
+                                                                <i class="ki-filled ki-category text-lg text-gray-500">
+                                                                </i>
+                                                            </div>
+                                                        </div>
+                                                        <div class="flex flex-col gap-1">
+                                                            <span class="flex items-center gap-1.5 leading-none font-medium text-sm text-gray-900">
+                                                                {{ $role->name }}
+                                                            </span>
+                                                            <span class="text-2sm text-gray-700">
+
+                                                            </span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="switch switch-sm">
+                                                        <input {{ in_array($role->name,Auth()->user()->roles->pluck('name')->toArray()) ? 'checked' : '' }} name="roles" type="radio" value="{{ $role->id }}">
+                                                    </div>
+                                                </div>
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="flex justify-end">
+                                    <button type="submit" class="btn btn-primary">
+                                        Save
+                                    </button>
                                 </div>
                             </div>
-                            @error('password_confirmation')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
                         </div>
-                    </div>
-
-                    <div class="flex justify-end">
-                        <button type="submit" class="btn btn-primary">
-                            Save
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
+                    </form>
     </div>
 @endsection