diff --git a/app/Http/Controllers/Web/Konfigurasi/AuthController.php b/app/Http/Controllers/Web/Konfigurasi/AuthController.php
index ec89fc6..1ec05b3 100644
--- a/app/Http/Controllers/Web/Konfigurasi/AuthController.php
+++ b/app/Http/Controllers/Web/Konfigurasi/AuthController.php
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 
 class AuthController extends Controller
@@ -26,23 +26,22 @@ class AuthController extends Controller
 
     public function createAccount(Request $request)
     {
-        $validator = Validator::make($request->all(), [
-            'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
+        $credentials = $request->validate([
+            'username' => 'required|string|max:255|unique:users,username',
+            'email' => 'required|string|email|max:255|unique:users,email',
             'password' => 'required|string|min:8|confirmed',
         ]);
 
         User::create([
-            'name' => $request->name,
-            'email' => $request->email,
-            'password' => Hash::make($request->password),
+            'uid' => (string) Str::uuid(),
+            'name' => $credentials['username'],
+            'username' => $credentials['username'],
+            'email' => $credentials['email'],
+            'password' => Hash::make($credentials['password']),
             'email_verified_at' => null,
-            'created_by' => null,
-            'updated_by' => null,
-            'deleted_by' => null,
         ]);
 
-        return redirect()->route('auth.login')->with('success', 'Account created successfully. Please login.');
+        return redirect()->route('login')->with('success', 'Account created successfully. Please login.');
     }
 
     public function verify(User $user)
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index f80a00e..208cefe 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -56,13 +56,20 @@
             type="text"
             class="form-control"
             id="username"
-            name="name"
+            name="username"
+            value="{{ old('username') }}"
             placeholder="Enter your username"
             autofocus />
+            @error('username')
+                <div class="invalid-feedback d-block">{{ $message }}</div>
+            @enderror
         </div>
         <div class="mb-6 form-control-validation">
             <label for="email" class="form-label">Email</label>
-            <input type="text" class="form-control" id="email" name="email" placeholder="Enter your email" />
+            <input type="text" class="form-control" id="email" name="email" value="{{ old('email') }}" placeholder="Enter your email" />
+            @error('email')
+                <div class="invalid-feedback d-block">{{ $message }}</div>
+            @enderror
         </div>
         <div class="mb-6 form-password-toggle form-control-validation">
             <label class="form-label" for="password">Password</label>
@@ -76,6 +83,22 @@
                 aria-describedby="password" />
             <span class="input-group-text cursor-pointer"><i class="icon-base ti tabler-eye-off"></i></span>
             </div>
+            @error('password')
+                <div class="invalid-feedback d-block">{{ $message }}</div>
+            @enderror
+        </div>
+        <div class="mb-6 form-password-toggle form-control-validation">
+            <label class="form-label" for="password_confirmation">Confirm Password</label>
+            <div class="input-group input-group-merge">
+            <input
+                type="password"
+                id="password_confirmation"
+                class="form-control"
+                name="password_confirmation"
+                placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
+                aria-describedby="password_confirmation" />
+            <span class="input-group-text cursor-pointer"><i class="icon-base ti tabler-eye-off"></i></span>
+            </div>
         </div>
         <div class="my-8 form-control-validation">
             <div class="form-check mb-0 ms-2">
@@ -119,4 +142,4 @@
         </div>
     </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection