diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 8e9daf59..a10b02f7 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -75,6 +75,20 @@ class AppServiceProvider extends ServiceProvider
         if(env('APP_URL') != 'http://localhost') {
             \URL::forceRootUrl(env('APP_URL'));
         }
+        if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
+            list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = 
+            explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+        }
+        if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+            $credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
+            
+            if (\Auth::attempt($credentials)) {
+                // Authentication passed...
+                $user = \Auth::user();
+                session(['current_user' => $user]);                
+            }
+    
+        }
 
     }
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 90e41486..e3456920 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -78,7 +78,7 @@
                         @else
                         <img class="user-img" src="{{ asset('/img/heimdall-icon-small.png') }}" />
                         @endif
-                        {{ $current_user->name }}
+                        {{ $current_user->username }}
                         <a class="btn" href="{{ route('user.select') }}">Switch User</a>
                     </div>
                     @endif