diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b9fc2904..ab01f8ee 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -53,19 +53,6 @@ class AppServiceProvider extends ServiceProvider
         // User specific settings need to go here as session isn't available at this point in the app
         view()->composer('*', function ($view) 
         {
-            $alt_bg = '';
-            if($bg_image = Setting::fetch('background_image')) {
-                $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
-            }
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
-
-            $allusers = User::all();
-            $current_user = User::currentUser();
-
-            $view->with('alt_bg', $alt_bg );    
-            $view->with('allusers', $allusers );    
-            $view->with('current_user', $current_user );   
 
             if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
                 list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = 
@@ -78,11 +65,27 @@ class AppServiceProvider extends ServiceProvider
                     if (\Auth::attempt($credentials)) {
                         // Authentication passed...
                         $user = \Auth::user();
-                        \Session::put('current_user', $user);
-                        //session(['current_user' => $user]);                
+                        //\Session::put('current_user', $user);
+                        session(['current_user' => $user]);                
                     }
                 }
             }
+
+
+            $alt_bg = '';
+            if($bg_image = Setting::fetch('background_image')) {
+                $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
+            }
+            $lang = Setting::fetch('language');
+            \App::setLocale($lang);
+
+            $allusers = User::all();
+            $current_user = User::currentUser();
+
+            $view->with('alt_bg', $alt_bg );    
+            $view->with('allusers', $allusers );    
+            $view->with('current_user', $current_user );   
+