diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 551670419c55..1c4b4eb08f4d 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -164,17 +164,18 @@ class CompanyImport implements ShouldQueue
         $this->backup_file = json_decode(base64_decode($this->backup_file));
 
         // nlog($this->backup_file);
+        $this->checkUserCount();
 
         if(array_key_exists('import_settings', $this->request_array) && $this->request_array['import_settings'] == 'true') {
-            $this->checkUserCount()->preFlightChecks()->importSettings();
+            
+            $this->preFlightChecks()->importSettings();
         }
 
         if(array_key_exists('import_data', $this->request_array) && $this->request_array['import_data'] == 'true') {
 
             try{
 
-                $this->checkUserCount()
-                     ->preFlightChecks()
+                $this->preFlightChecks()
                      ->purgeCompanyData()
                      ->importData();
 
@@ -208,7 +209,6 @@ class CompanyImport implements ShouldQueue
         
         $company_owner = $this->company->owner();
 
-        if($this->company->account->isFreeHostedClient()){
 
             nlog("This is a free account");
             nlog("Backup user count = ".count($backup_users));
@@ -268,7 +268,6 @@ class CompanyImport implements ShouldQueue
 
             }
 
-        }
 
         nlog($this->message);
         nlog($this->pre_flight_checks_pass);