diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 5796d038dce1..0fb06a7f44c6 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -54,7 +54,9 @@ class NinjaMailerJob implements ShouldQueue
 
     public $nmo;
 
-    public function __construct(NinjaMailerObject $nmo)
+    public $override;
+
+    public function __construct(NinjaMailerObject $nmo, bool $override = false)
     {
 
         $this->nmo = $nmo;
@@ -64,7 +66,7 @@ class NinjaMailerJob implements ShouldQueue
     public function handle()
     {
         /*If we are migrating data we don't want to fire any emails*/
-        if ($this->nmo->company->is_disabled) 
+        if ($this->nmo->company->is_disabled && !$this->override) 
             return true;
         
         /*Set the correct database*/
diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php
index de433a4c826f..a87a83b11f52 100644
--- a/app/Jobs/User/UserEmailChanged.php
+++ b/app/Jobs/User/UserEmailChanged.php
@@ -55,9 +55,6 @@ class UserEmailChanged implements ShouldQueue
     public function handle()
     {
         nlog("notifying user of email change");
-
-        if ($this->company->is_disabled) 
-            return true;
         
         //Set DB
         MultiDB::setDb($this->company->db);
@@ -78,7 +75,7 @@ class UserEmailChanged implements ShouldQueue
         $nmo->company = $this->company;
         $nmo->to_user = $this->old_user;
 
-        NinjaMailerJob::dispatch($nmo);
+        NinjaMailerJob::dispatch($nmo, true);
 
         // $nmo->to_user = $this->new_user;
         // NinjaMailerJob::dispatch($nmo);
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 7fc8ec6ea423..e3a2a267fcd3 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -209,6 +209,9 @@ class Import implements ShouldQueue
             $this->{$method}($data[$import]);
         }
 
+        if(Ninja::isHosted())
+            $this->processNinjaTokens($data['ninja_tokens']);
+
         $this->setInitialCompanyLedgerBalances();
         
         // $this->fixClientBalances();
@@ -1636,6 +1639,10 @@ class Import implements ShouldQueue
         return $response->getBody();
     }
 
+    private function processNinjaTokens(array $data)
+    {
+        
+    }
 
     /* In V4 we use negative invoices (credits) and add then into the client balance. In V5, these sit off ledger and are applied later.
      This next section will check for credit balances and reduce the client balance so that the V5 balances are correct