diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php
index 68bd4d934a92..eda0c48d991c 100644
--- a/app/Http/Controllers/LogoutController.php
+++ b/app/Http/Controllers/LogoutController.php
@@ -59,12 +59,14 @@ class LogoutController extends BaseController
      */
     public function index(Request $request)
     {
-        CompanyToken::whereRaw('BINARY `token`= ?', [$request->header('X-API-TOKEN')])
+        CompanyToken::with('company')
+                    ->whereRaw('BINARY `token`= ?', [$request->header('X-API-TOKEN')])
                     ->company
                     ->tokens()
+                    ->where('is_system', true)
                     ->forceDelete();
 
-        return response()->json(['message' => 'logged out.'], 200);
+        return response()->json(['message' => 'All tokens deleted'], 200);
     }
 
 }
diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index 91218652a4fd..92132a118be2 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -295,6 +295,7 @@ class MultiDB
         /* This will set the database connection for the request */
         config(['database.default' => $database]);
 
+        // for some reason this breaks everything _hard_
         // DB::purge($database);
         // DB::reconnect($database);
     }