diff --git a/app/Exceptions/ClientHostedMigrationException.php b/app/Exceptions/ClientHostedMigrationException.php
new file mode 100644
index 000000000000..0f14ee0c7103
--- /dev/null
+++ b/app/Exceptions/ClientHostedMigrationException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ClientHostedMigrationException extends Exception
+{
+    // ..
+}
diff --git a/app/Exceptions/FilePermissionsFailure.php b/app/Exceptions/FilePermissionsFailure.php
index 760a3b2d7500..dd6604f12ce2 100644
--- a/app/Exceptions/FilePermissionsFailure.php
+++ b/app/Exceptions/FilePermissionsFailure.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/GenericPaymentDriverFailure.php b/app/Exceptions/GenericPaymentDriverFailure.php
index 2feb0e7410e0..7fdcc6e54b51 100644
--- a/app/Exceptions/GenericPaymentDriverFailure.php
+++ b/app/Exceptions/GenericPaymentDriverFailure.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/ImportCompanyFailed.php b/app/Exceptions/ImportCompanyFailed.php
index 9bb887ccd647..1de371399f28 100644
--- a/app/Exceptions/ImportCompanyFailed.php
+++ b/app/Exceptions/ImportCompanyFailed.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/InternalPDFFailure.php b/app/Exceptions/InternalPDFFailure.php
index ce85ad3c7ebb..efde106e9302 100644
--- a/app/Exceptions/InternalPDFFailure.php
+++ b/app/Exceptions/InternalPDFFailure.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/MigrationValidatorFailed.php b/app/Exceptions/MigrationValidatorFailed.php
index 3557444e4139..609281b0a909 100644
--- a/app/Exceptions/MigrationValidatorFailed.php
+++ b/app/Exceptions/MigrationValidatorFailed.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/NonExistingBackupFile.php b/app/Exceptions/NonExistingBackupFile.php
index 77c29936d6e6..128ab8791069 100644
--- a/app/Exceptions/NonExistingBackupFile.php
+++ b/app/Exceptions/NonExistingBackupFile.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/NonExistingMigrationFile.php b/app/Exceptions/NonExistingMigrationFile.php
index ae89a4955a79..11b2a679d71e 100644
--- a/app/Exceptions/NonExistingMigrationFile.php
+++ b/app/Exceptions/NonExistingMigrationFile.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/PaymentFailed.php b/app/Exceptions/PaymentFailed.php
index 108e1071f6dc..9b2735edd08a 100644
--- a/app/Exceptions/PaymentFailed.php
+++ b/app/Exceptions/PaymentFailed.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/PaymentRefundFailed.php b/app/Exceptions/PaymentRefundFailed.php
index d2be5cadc8b2..bb273ba25973 100644
--- a/app/Exceptions/PaymentRefundFailed.php
+++ b/app/Exceptions/PaymentRefundFailed.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/PhantomPDFFailure.php b/app/Exceptions/PhantomPDFFailure.php
index 447238a06c30..177064bc38d7 100644
--- a/app/Exceptions/PhantomPDFFailure.php
+++ b/app/Exceptions/PhantomPDFFailure.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/ProcessingMigrationArchiveFailed.php b/app/Exceptions/ProcessingMigrationArchiveFailed.php
index 0b89be1ee4d7..3f042e8d2bb3 100644
--- a/app/Exceptions/ProcessingMigrationArchiveFailed.php
+++ b/app/Exceptions/ProcessingMigrationArchiveFailed.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/ResourceDependencyMissing.php b/app/Exceptions/ResourceDependencyMissing.php
index 46c35dca8ef2..612f1a34a86b 100644
--- a/app/Exceptions/ResourceDependencyMissing.php
+++ b/app/Exceptions/ResourceDependencyMissing.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/ResourceNotAvailableForMigration.php b/app/Exceptions/ResourceNotAvailableForMigration.php
index 9c252aecda2e..09c2134ed81d 100644
--- a/app/Exceptions/ResourceNotAvailableForMigration.php
+++ b/app/Exceptions/ResourceNotAvailableForMigration.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/StripeConnectFailure.php b/app/Exceptions/StripeConnectFailure.php
index 1aae9e57eabe..32df56383181 100644
--- a/app/Exceptions/StripeConnectFailure.php
+++ b/app/Exceptions/StripeConnectFailure.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/SystemError.php b/app/Exceptions/SystemError.php
index 03b0aaabe0c7..dbae001f6112 100644
--- a/app/Exceptions/SystemError.php
+++ b/app/Exceptions/SystemError.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Exceptions/YodleeApiException.php b/app/Exceptions/YodleeApiException.php
index c5c4458e5e3d..c8a2e224f135 100644
--- a/app/Exceptions/YodleeApiException.php
+++ b/app/Exceptions/YodleeApiException.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Exceptions;
 
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 381a657ff3c6..20f33d21f733 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -591,19 +591,17 @@ class Import implements ShouldQueue
 
         $current_db = config('database.default');
 
-        foreach (MultiDB::$dbs as $db) 
-        {
-            
-            MultiDB::setDB($db);
-
-            $db1_count = User::withTrashed()->whereIn('email', array_column($data, 'email'))->count();
-            $db2_count = User::withTrashed()->whereIn('email', array_column($data, 'email'))->count();
-
-        }
-
+        $db1_count = User::on('db-ninja-01')->withTrashed()->whereIn('email', array_column($data, 'email'))->count();
+        $db2_count = User::on('db-ninja-02')->withTrashed()->whereIn('email', array_column($data, 'email'))->count();
 
         MultiDB::setDb($current_db);
 
+        if($db2_count == 0 && $db1_count == 0)
+            return true;
+
+        if($db1_count >= 1 && $db2_count >= 1)
+            return false;
+
         return true;
     }
 
@@ -613,8 +611,8 @@ class Import implements ShouldQueue
      */
     private function processUsers(array $data): void
     {
-        if(!$this->testUserDbLocationSanity())
-            throw new ClientHostedMigrationException('You have multiple accounts registered in the system, please contact us to resolve.', 400);
+        if(!$this->testUserDbLocationSanity($data))
+            throw new ClientHostedMigrationException('You have users that belong to different accounts registered in the system, please contact us to resolve.', 400);
 
         User::unguard();
 
diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php
index af9fc209b125..44be3af46b41 100644
--- a/app/Mail/MigrationFailed.php
+++ b/app/Mail/MigrationFailed.php
@@ -1,7 +1,18 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
 
 namespace App\Mail;
 
+use App\Exceptions\ClientHostedMigrationException;
 use App\Models\Company;
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\App;
@@ -37,12 +48,17 @@ class MigrationFailed extends Mailable
     public function build()
     {
         App::setLocale($this->company->getLocale());
+        
+        $special_message = '';
+
+        if($this->exception instanceof ClientHostedMigrationException)
+            $special_message = $this->content;
 
         return $this
             ->from(config('mail.from.address'), config('mail.from.name'))
             ->text('email.migration.failed_text')
             ->view('email.migration.failed', [
-                'special_message' => '',
+                'special_message' => $special_message,
                 'logo' => $this->company->present()->logo(),
                 'settings' => $this->company->settings,
                 'is_system' => $this->is_system,