diff --git a/app/models/concerns/set_unused_address_fields.rb b/app/models/concerns/set_unused_address_fields.rb
index 1e07d40660..cb6f563f25 100644
--- a/app/models/concerns/set_unused_address_fields.rb
+++ b/app/models/concerns/set_unused_address_fields.rb
@@ -8,7 +8,7 @@ module SetUnusedAddressFields
   end
 
   def set_unused_address_fields
-    ship_address.company = 'Company' if ship_address.present?
-    bill_address.company = 'Company' if bill_address.present?
+    ship_address.company = 'unused' if ship_address.present?
+    bill_address.company = 'unused' if bill_address.present?
   end
 end
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 362be4d54a..fc030bd1a1 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Customer < ApplicationRecord
+  include SetUnusedAddressFields
+  
   acts_as_taggable
 
   searchable_attributes :name, :email, :code
@@ -20,7 +22,6 @@ class Customer < ApplicationRecord
 
   before_validation :downcase_email
   before_validation :empty_code
-  before_validation :set_unused_address_fields
 
   validates :code, uniqueness: { scope: :enterprise_id, allow_nil: true }
   validates :email, presence: true, 'valid_email_2/email': true,
@@ -53,9 +54,4 @@ class Customer < ApplicationRecord
     errors.add(:base, I18n.t('admin.customers.destroy.has_associated_orders'))
     throw :abort
   end
-
-  def set_unused_address_fields
-    ship_address.company = 'Company' if ship_address.present?
-    bill_address.company = 'Company' if bill_address.present?
-  end
 end
diff --git a/spec/factories/address_factory.rb b/spec/factories/address_factory.rb
index 3a2dadf090..036318c6f3 100644
--- a/spec/factories/address_factory.rb
+++ b/spec/factories/address_factory.rb
@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
     firstname { 'John' }
     lastname { 'Doe' }
-    company { 'Company' }
+    company { 'unused' }
     address1 { '10 Lovely Street' }
     address2 { 'Northwest' }
     city { 'Herndon' }
diff --git a/spec/models/spree/address_spec.rb b/spec/models/spree/address_spec.rb
index f0f838ddcd..a1cb4fa8dd 100644
--- a/spec/models/spree/address_spec.rb
+++ b/spec/models/spree/address_spec.rb
@@ -14,7 +14,7 @@ describe Spree::Address do
                                country: state.country,
                                firstname: 'firstname',
                                lastname: 'lastname',
-                               company: 'company',
+                               company: 'unused',
                                phone: 'phone',
                                state_id: state.id,
                                state_name: state.name,