diff --git a/public/assets/js/bootstrap-table.js b/public/assets/js/bootstrap-table.js
index f8715e9c4..1c891bbc5 100755
--- a/public/assets/js/bootstrap-table.js
+++ b/public/assets/js/bootstrap-table.js
@@ -254,7 +254,11 @@
         cache: true,
         contentType: 'application/json',
         dataType: 'json',
-        ajaxOptions: {},
+        ajaxOptions: {
+         headers: {
+                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            }
+        },
         queryParams: function (params) {
             return params;
         },
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 54928b819..157719889 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -25,9 +25,7 @@
 
     <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
 
-      <script>
-          window.Laravel = { csrfToken: '{{ csrf_token() }}' };
-      </script>
+    <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <style>
         @if ($snipeSettings)
@@ -275,6 +273,7 @@
 
 
                <!-- User Account: style can be found in dropdown.less -->
+               @if (Auth::check())
                <li class="dropdown user user-menu">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                    @if (Auth::user()->present()->gravatar())
@@ -312,6 +311,7 @@
                      </li>
                  </ul>
                </li>
+               @endif
 
 
                @can('superadmin')