diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
index aae07fcc..782b3b11 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
@@ -78,7 +78,9 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
 
         $query = $this->updatesCompany->execute($query, $object);
 
-        $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        if ($request->input('debtor') || $query->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        }
 
         return $this->resourceResponse(new CompanyResource($query));
     }
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php
index 70f130f9..3e85df32 100644
--- a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php
@@ -15,7 +15,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $model, string $debtor) 
+    public function execute(Company $model, ?string $debtor) 
     {
         $model->debtor = $debtor;
 
diff --git a/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue
index 4373f6d5..5fc2398c 100644
--- a/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue
@@ -27,7 +27,7 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.company.update.nameAndDebtor', data.id), 'put', section, true, true)">Confirm</div>
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
                 </div>
             </div>
         </div>
@@ -62,6 +62,9 @@
         methods: {
             successHandler(response) {
                 window.location.replace(this.route('customers', response.payload.data.reference));
+            },
+            submitForm() {
+                this.submit(this.route('api.company.update.nameAndDebtor', this.data.id), 'put', this.section, true, true)
             }
         },
         mixins: [modalFormHandler]