diff --git a/app/Http/Controllers/Backend/Auth/LoginController.php b/app/Http/Controllers/Backend/Auth/LoginController.php
index c799e56..761f475 100644
--- a/app/Http/Controllers/Backend/Auth/LoginController.php
+++ b/app/Http/Controllers/Backend/Auth/LoginController.php
@@ -123,23 +123,17 @@ class LoginController extends Controller
     {
         $user = Auth::guard('admin')->user();
 
-        if (!$user) {
-            Auth::guard('admin')->logout();
-            return redirect()->route('admin.login');
+        if ($user) {
+            // Log activity hanya jika user valid
+            AuditTrailHelper::AuthAttempt('Logout', 'User (' . $user->username . ') Logged out from the System');
         }
 
-        // Log activity
-        AuditTrailHelper::AuthAttempt('Logout', 'User (' . $user->username . ') Logged out from the System');
-
         try {
-            // Logout from admin guard
             Auth::guard('admin')->logout();
         } catch (Exception $e) {
-            // Fallback to web guard if admin logout fails
             Auth::guard('web')->logout();
         }
 
-        // Redirect to admin login
         return redirect()->route('admin.login');
     }
 }
diff --git a/app/Listeners/LogLoginActivity.php b/app/Listeners/LogLoginActivity.php
deleted file mode 100644
index db58602..0000000
--- a/app/Listeners/LogLoginActivity.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Auth\Events\Login;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
-use App\Models\LoginLog;
-
-class LogLoginActivity
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(Login $event): void
-    {
-        // Ambil data user yang login
-        $user = $event->user;
-
-        // Simpan log login
-        LoginLog::create([
-            'user_id'    => $user->id ?? null,
-            'ip_address' => request()->ip(),
-            'user_agent' => request()->userAgent(),
-            'status'     => 'login',
-        ]);
-    }
-}
diff --git a/app/Listeners/LogLogoutActivity.php b/app/Listeners/LogLogoutActivity.php
deleted file mode 100644
index 4b8bfd7..0000000
--- a/app/Listeners/LogLogoutActivity.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Auth\Events\Logout;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
-use App\Models\LoginLog;
-
-class LogLogoutActivity
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(Logout $event): void
-    {
-        // Ambil data user yang logout
-        $user = $event->user;
-
-        // Simpan log logout
-        LoginLog::create([
-            'user_id'    => $user->id ?? null,
-            'ip_address' => request()->ip(),
-            'user_agent' => request()->userAgent(),
-            'status'     => 'logout', // Kolom tambahan untuk menandakan logout
-        ]);
-    }
-}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 22f4c1b..723a290 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -18,12 +18,6 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
-        \Illuminate\Auth\Events\Login::class => [
-            \App\Listeners\LogLoginActivity::class,
-        ],
-        \Illuminate\Auth\Events\Logout::class => [
-            \App\Listeners\LogLogoutActivity::class,
-        ],
     ];
 
     /**
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 9a5f7ad..8c5cba7 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -272,7 +272,7 @@
         });
 </script>
 
-<script>
+{{-- <script>
     let logoutTimer;
 
     function resetLogoutTimer() {
@@ -295,7 +295,7 @@
     document.addEventListener('keydown', resetLogoutTimer);
 
     resetLogoutTimer();
-</script>
+</script> --}}
 
 <script>
     const periode = document.getElementById('periode');
diff --git a/resources/views/layouts/partials/logout.blade.php b/resources/views/layouts/partials/logout.blade.php
index f39f31e..ae5918d 100644
--- a/resources/views/layouts/partials/logout.blade.php
+++ b/resources/views/layouts/partials/logout.blade.php
@@ -3,15 +3,9 @@
     <a href="#" class="dropdown-item">
         <i class="fas fa-user"></i> My Account
     </a>
-   
 
     <div class="dropdown-divider"></div>
-    <a class="dropdown-item dropdown-footer" href="{{ route('admin.logout.submit') }}"
-        onclick="event.preventDefault();
-            document.getElementById('admin-logout-form').submit();">Logout
-        Account</a>
-
-    <form id="admin-logout-form" action="{{ route('admin.logout.submit') }}" method="POST" style="display: none;">
-        @csrf
-    </form>
+    <a class="dropdown-item dropdown-footer" href="{{ route('admin.logout.submit') }}">
+        Logout Account
+    </a>
 </div>
diff --git a/routes/web.php b/routes/web.php
index 1d9f1bb..d713f33 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,7 +32,7 @@ Route::group(['prefix' => 'admin', 'as' => 'admin.'], function () {
     Route::post('/login/submit', [LoginController::class, 'login'])->name('login.submit');
     Route::get('/login', [LoginController::class, 'showLoginForm'])->name('login');
     // Logout Routes.
-    Route::post('/logout/submit', [LoginController::class, 'logout'])->name('logout.submit');
+    Route::get('/logout/submit', [LoginController::class, 'logout'])->name('logout.submit');
 });