diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 05c81b3cf5..2fa51dcd17 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -52,7 +52,7 @@ class AssetsController extends Controller
      */
     public function index(Request $request, $audit = null) 
     {
-        \Log::debug(Route::currentRouteName());
+
         $filter_non_deprecable_assets = false;
 
         /**
@@ -345,6 +345,7 @@ class AssetsController extends Controller
         }
 
 
+
         /**
          * Here we're just determining which Transformer (via $transformer) to use based on the 
          * variables we set earlier on in this method - we default to AssetsTransformer.
@@ -730,6 +731,7 @@ class AssetsController extends Controller
             $logaction->logaction('restored');
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.restore.success')));
+        
 
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7581e61bed..5f15918a92 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -82,6 +82,7 @@ class LoginController extends Controller
         }
 
         if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
             return view('errors.403');
         }
 
@@ -103,13 +104,18 @@ class LoginController extends Controller
      */
     private function loginViaSaml(Request $request)
     {
+        \Log::debug('Attempting to login via SAML');
         $saml = $this->saml;
         $samlData = $request->session()->get('saml_login');
+
         if ($saml->isEnabled() && ! empty($samlData)) {
+            \Log::debug('SAML is enabled, and the samleData is not empty');
+
             try {
                 Log::debug('Attempting to log user in by SAML authentication.');
                 $user = $saml->samlLogin($samlData);
-                if (! is_null($user)) {
+
+                if (!is_null($user)) {
                     Auth::login($user);
                 } else {
                     $username = $saml->getUsername();
@@ -122,11 +128,26 @@ class LoginController extends Controller
                     $user->last_login = \Carbon::now();
                     $user->save();
                 }
+                
             } catch (\Exception $e) {
                 \Log::warning('There was an error authenticating the SAML user: '.$e->getMessage());
                 throw new \Exception($e->getMessage());
             }
+
+        // Fallthrough with better logging
+        } else {
+
+            // Better logging
+            if (!$saml->isEnabled()) {
+                \Log::warning("SAML page requested, but SAML does not seem to enabled.");
+            } else {
+                \Log::warning("SAML page requested, but samlData seems empty.");
+            }
         }
+
+        \Log::warning("Something else went wrong while trying to login as SAML user");
+
+
     }
 
     /**
@@ -241,10 +262,12 @@ class LoginController extends Controller
 
         //If the environment is set to ALWAYS require SAML, return access denied
         if (config('app.require_saml')) {
+            \Log::debug('require SAML is enabled in the .env - return a 403');
             return view('errors.403');
         }
 
         if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
             return view('errors.403');
         }
 
@@ -475,6 +498,7 @@ class LoginController extends Controller
         ]);
     }
 
+
     public function username()
     {
         return 'username';
@@ -501,6 +525,7 @@ class LoginController extends Controller
             ->withErrors([$this->username() => $message]);
     }
 
+
     /**
      * Override the lockout time and duration
      *
diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.php
index 41eda91d9c..d84ae2601a 100644
--- a/app/Http/Controllers/Auth/SamlController.php
+++ b/app/Http/Controllers/Auth/SamlController.php
@@ -51,6 +51,7 @@ class SamlController extends Controller
         $metadata = $this->saml->getSPMetadata();
 
         if (empty($metadata)) {
+            \Log::debug('SAML metadata is empty - return a 403');
             return response()->view('errors.403', [], 403);
         }
 
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index cce2a8ecd5..1e8784f2fc 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -189,6 +189,14 @@ class LicensePresenter extends Presenter
     public static function dataTableLayoutSeats()
     {
         $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+           ],
            [
                 'field' => 'name',
                 'searchable' => false,
diff --git a/app/Services/Saml.php b/app/Services/Saml.php
index 9d73e05b49..f2f3ee588d 100644
--- a/app/Services/Saml.php
+++ b/app/Services/Saml.php
@@ -130,9 +130,11 @@ class Saml
             $this->clearData();
         }
 
+        \Log::debug('Trying to create a new OneLogin_Saml2_Auth object ');
         try {
             $this->_auth = new OneLogin_Saml2_Auth($this->_settings);
         } catch (Exception $e) {
+            \Log::error('Trying OneLogin_Saml2_Auth failed. Setting SAML enabled to false. OneLogin_Saml2_Auth error message is: '.  $e->getMessage());
             $this->_enabled = false;
         }
     }
@@ -155,6 +157,7 @@ class Saml
         $this->_enabled = $setting->saml_enabled == '1';
 
         if ($this->isEnabled()) {
+            \Log::debug('SAML is enabled according to loadSettings()');
             //Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
             OneLogin_Saml2_Utils::setProxyVars(request()->isFromTrustedProxy());
 
diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js
index 8e313017a1..6ddc3bf4d7 100644
--- a/resources/assets/js/snipeit_modals.js
+++ b/resources/assets/js/snipeit_modals.js
@@ -199,13 +199,13 @@ function formatDatalistSafe(datalist) {
     root_div.append(name_div)
     var safe_html = root_div.get(0).outerHTML;
     var old_html = formatDatalist(datalist);
-    if(safe_html != old_html) {
-        console.log("HTML MISMATCH: ");
-        console.log("FormatDatalistSafe: ");
+    if (safe_html != old_html) {
+        // console.log("HTML MISMATCH: ");
+        // console.log("FormatDatalistSafe: ");
         // console.dir(root_div.get(0));
-        console.log(safe_html);
-        console.log("FormatDataList: ");
-        console.log(old_html);
+        // console.log(safe_html);
+        // console.log("FormatDataList: ");
+        // console.log(old_html);
     }
     return root_div;
 
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index ec15e1dc03..1da8353f28 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -256,4 +256,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>