diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 7532d2f6095c..6f12d5a26514 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -163,20 +163,23 @@ class Kernel extends HttpKernel
 
 
     protected $middlewarePriority = [
-        ContactTokenAuth::class,
-        ContactSetDb::class,
-        SetInviteDb::class,
-        ContactRegister::class,
-        ShopTokenAuth::class,
-        PhantomSecret::class,
-        ContactKeyLogin::class,
-        CheckClientExistence::class,
-        ClientPortalEnabled::class,
-        UrlSetDb::class,
-        SetWebDb::class,
         SetDb::class,
+        SetWebDb::class,
+        UrlSetDb::class,
+        ContactSetDb::class,
+        SetEmailDb::class,
+        SetInviteDb::class,
         SetDbByCompanyKey::class,
         TokenAuth::class,
+        ContactTokenAuth::class,
+        ShopTokenAuth::class,
+        ContactKeyLogin::class,
+        ContactRegister::class,
+        PhantomSecret::class,
+        CheckClientExistence::class,
+        ClientPortalEnabled::class,
+        PasswordProtection::class,
+        Locale::class,
         SubstituteBindings::class,
     ];
 }
diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php
index 7759b7df566d..183d7aa5b27c 100644
--- a/app/Jobs/Import/CSVImport.php
+++ b/app/Jobs/Import/CSVImport.php
@@ -96,8 +96,8 @@ class CSVImport implements ShouldQueue {
 		MultiDB::setDb( $this->company->db );
 
 		Auth::login( $this->company->owner(), true );
-
-		$this->company->owner()->setCompany( $this->company );
+		
+		auth()->user()->setCompany($this->company);
 
 		$this->buildMaps();
 
diff --git a/tests/Feature/Import/ImportCsvTest.php b/tests/Feature/Import/ImportCsvTest.php
index d1167dc9a008..49b4cc9f46ee 100644
--- a/tests/Feature/Import/ImportCsvTest.php
+++ b/tests/Feature/Import/ImportCsvTest.php
@@ -42,6 +42,7 @@ class ImportCsvTest extends TestCase
         $this->withoutMiddleware(
             ThrottleRequests::class
         );
+        config(['database.default' => config('ninja.db.default')]);
 
         // $this->faker = \Faker\Factory::create();
 
diff --git a/tests/Integration/MultiDBUserTest.php b/tests/Integration/MultiDBUserTest.php
index cdeadfe43305..311493f1e496 100644
--- a/tests/Integration/MultiDBUserTest.php
+++ b/tests/Integration/MultiDBUserTest.php
@@ -19,6 +19,7 @@ use App\Models\CompanyUser;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
 
 /**
@@ -33,6 +34,8 @@ class MultiDBUserTest extends TestCase
     {
         parent::setUp();
 
+        $this->withoutExceptionHandling();
+
         if (! config('ninja.db.multi_db_enabled')) {
             $this->markTestSkipped('Multi DB not enabled - skipping');
         }
@@ -200,10 +203,11 @@ class MultiDBUserTest extends TestCase
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
+
         }
 
         if ($response) {
-            $response->assertStatus(302);
+            $response->assertStatus(403);
         }
     }
 
@@ -242,5 +246,8 @@ class MultiDBUserTest extends TestCase
     {
         DB::connection('db-ninja-01')->table('users')->delete();
         DB::connection('db-ninja-02')->table('users')->delete();
+
+        config(['database.default' => config('ninja.db.default')]);
+
     }
 }
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 016fd2960794..f20b0a4737fa 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -128,6 +128,7 @@ trait MockAccountData
      */
     public function makeTestData()
     {
+        config(['database.default' => config('ninja.db.default')]);
 
         /* Warm up the cache !*/
         $cached_tables = config('ninja.cached_tables');