diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 585df5e250aa..2527c8654359 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -191,7 +191,9 @@ class LoginController extends BaseController
 
             Auth::login($account->default_company->owner(), true);
             
-            return redirect($this->redirectTo);
+            $cookie = cookie('db', $account->default_company->db);
+
+            return redirect($this->redirectTo)->withCookie($cookie);
         }
 
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 455b143c09db..8cd305857d7c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -56,7 +56,10 @@ class Kernel extends HttpKernel
         'db' => [
             \App\Http\Middleware\SetDb::class,
         ],
-        'url-db' => [
+        'web_db' => [
+            \App\Http\Middleware\SetWebDb::class,
+        ],
+        'url_db' => [
             \App\Http\Middleware\UrlSetDb::class,
         ]
     ];
diff --git a/app/Http/Middleware/setDb.php b/app/Http/Middleware/setDb.php
index d0186d2ec2d5..15413e2a0d8a 100644
--- a/app/Http/Middleware/setDb.php
+++ b/app/Http/Middleware/setDb.php
@@ -46,6 +46,7 @@ class SetDb
 
 
             return response()->json(json_encode($error, JSON_PRETTY_PRINT) ,403);
+            
         }
 
         return $next($request);
diff --git a/routes/web.php b/routes/web.php
index f0c11959dfbc..263c4b4105d9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -37,7 +37,7 @@ Route::get('auth/{provider}', 'Auth\LoginController@redirectToProvider');
  * Authenticated User Routes
  */
 
-Route::group(['middleware' => ['auth:user', 'db']], function () {
+Route::group(['middleware' => ['auth:user', 'web_db']], function () {
 
 	Route::resource('dashboard', 'DashboardController'); // name = (dashboard. index / create / show / update / destroy / edit
 
@@ -88,7 +88,7 @@ Route::group(['middleware' => ['auth:user', 'db']], function () {
 /*
  * Inbound routes requiring DB Lookup
  */
-Route::group(['middleware' => ['url-db']], function () {
+Route::group(['middleware' => ['url_db']], function () {
 
     Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');