diff --git a/app/Http/Controllers/UserViewController.php b/app/Http/Controllers/UserViewController.php
new file mode 100644
index 0000000..6839b40
--- /dev/null
+++ b/app/Http/Controllers/UserViewController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class UserViewController extends Controller
+{
+    //
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index edaa977..19d8dc8 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,7 +5,7 @@ namespace App\Providers;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
-
+use App\View\Composers\UserViewComposer;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,9 +23,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         // Share authenticated user with the 'layouts.app' view
-        View::composer('layouts.app', function ($view) {
-            $user = Auth::user();
-            $view->with('user', $user);
-        });
+       View::composer('layouts.app', UserViewComposer::class);
     }
 }
diff --git a/app/View/Composers/UserViewComposer.php b/app/View/Composers/UserViewComposer.php
new file mode 100644
index 0000000..bad2d0e
--- /dev/null
+++ b/app/View/Composers/UserViewComposer.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\View\Composers;
+
+use Illuminate\View\View;
+use Illuminate\Support\Facades\Session;
+
+class UserViewComposer
+{
+    public function compose(View $view)
+    {
+        // Retrieve the user data from the session, default to null if not set
+        $user = Session::get('user', null);
+
+        // Share the user data with the view
+        $view->with('user', $user);
+    }
+}
\ No newline at end of file
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 18e785c..ec4c5e2 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -230,7 +230,7 @@
                                 <li class="nav-item dropdown">
                                     <a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
                                         role="button" data-toggle="dropdown">
-                                        <span style="margin-right:5px">{{ $user['admin']['username'] ?? 'N/A' }}</span>
+                                        <span style="margin-right:5px">{{ $user['admin']['username'] ?? 'Guest' }}</span>
                                         <i class="fa-solid fa-user-circle" style="padding-right:5px"></i>
                                     </a>
                                     <ul class="dropdown-menu dropdown-menu-end dropdown-menu-sm">