diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index e89077a297f2..413fc0257581 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -425,13 +425,9 @@ class Import implements ShouldQueue
             '*.first_name' => ['string'],
             '*.last_name' => ['string'],
             //'*.email' => ['distinct'],
-            '*.email' => ['distinct', 'email', new ValidUserForCompany(), new AttachableUser()],
+            '*.email' => ['distinct', 'email', new ValidUserForCompany()],
         ];
 
-        // if (config('ninja.db.multi_db_enabled')) {
-        //     array_push($rules['*.email'], new ValidUserForCompany());
-        // }
-
         $validator = Validator::make($data, $rules);
 
         if ($validator->fails()) {
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 36c6257a9e01..253946ff9fd0 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -144,7 +144,7 @@ class StartMigration implements ShouldQueue
             if(Ninja::isHosted())
                 app('sentry')->captureException($e);
             
-            Mail::to($this->user->email, $this->user->name())->send(new MigrationFailed($e, $this->company->settings, $e->getMessage()));
+            Mail::to($this->user->email, $this->user->name())->send(new MigrationFailed($e, $this->company, $e->getMessage()));
 
             if (app()->environment() !== 'production') {
                 info($e->getMessage());
diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php
index 44c8ab7d6f25..54002a5220dd 100644
--- a/app/Mail/MigrationFailed.php
+++ b/app/Mail/MigrationFailed.php
@@ -8,22 +8,23 @@ use Illuminate\Queue\SerializesModels;
 
 class MigrationFailed extends Mailable
 {
-    // use Queueable, SerializesModels;
 
     public $exception;
     public $content;
     public $settings;
+    public $company;
     /**
      * Create a new message instance.
      *
      * @param $content
      * @param $exception
      */
-    public function __construct($exception, $settings, $content = null)
+    public function __construct($exception, $company, $content = null)
     {
         $this->exception = $exception;
         $this->content = $content;
-        $this->settings = $settings;
+        $this->settings = $company->settings;
+        $this->company = $company;
     }
 
     /**
@@ -34,6 +35,6 @@ class MigrationFailed extends Mailable
     public function build()
     {
         return $this->from(config('mail.from.address'), config('mail.from.name'))
-                    ->view('email.migration.failed', ['settings' => $this->settings]);
+                    ->view('email.migration.failed', ['settings' => $this->settings, 'company' => $this->company]);
     }
 }
diff --git a/resources/views/email/migration/failed.blade.php b/resources/views/email/migration/failed.blade.php
index 9a546e247def..c304db3f3a84 100644
--- a/resources/views/email/migration/failed.blade.php
+++ b/resources/views/email/migration/failed.blade.php
@@ -3,7 +3,7 @@
         @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
     @endslot
 
-    <h1>Whoops, migration failed.</h1>
+    <h1>Whoops, migration failed for {{ $company->present()->name() }}.</h1>
     <p>Looks like your migration failed. Here's the error message:</p>
 
     <pre>