diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index efc3fbe96f82..93a73ac45d4c 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -203,6 +203,16 @@ trait GenerateMigrationResources
         $clients = [];
 
         foreach ($this->account->clients()->withTrashed()->get() as $client) {
+            
+        if($this->account->client_number_counter > 0){
+            $number = $client->id_number;
+            $id_number = '';
+        }
+        else{
+            $id_number = $client->id_number;
+            $number = NULL;
+        }
+
             $clients[] = [
                 'id' => $client->id,
                 'company_id' => $client->account_id,
@@ -223,7 +233,8 @@ trait GenerateMigrationResources
                 'size_id' => $client->size_id,
                 'is_deleted' => $client->is_deleted,
                 'vat_number' => $client->vat_number,
-                'id_number' => $client->id_number,
+                'id_number' => $id_number,
+                'number' => $number,
                 'custom_value1' => $client->custom_value1,
                 'custom_value2' => $client->custom_value2,
                 'shipping_address1' => $client->shipping_address1,
@@ -1613,6 +1624,7 @@ trait GenerateMigrationResources
                 'is_deleted' => $vendor->is_deleted,
                 'vat_number' => $vendor->vat_number,
                 'id_number' => $vendor->id_number,
+                'number' => NULL,
                 'custom_value1' => $vendor->custom_value1,
                 'custom_value2' => $vendor->custom_value2,
                 'custom_value3' => '',