diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 4f5c22938b..d23e8f71a7 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -717,7 +717,7 @@ module Spree
       (user&.email || email)&.downcase
     end
 
-    def associate_customer
+    def find_customer
       return customer if customer.present?
 
       Customer.of(distributor).find_by(email: email_for_customer)
@@ -738,7 +738,7 @@ module Spree
     end
 
     def ensure_customer
-      self.customer = associate_customer || create_customer
+      self.customer = find_customer || create_customer
     end
 
     def update_adjustment!(adjustment)
diff --git a/app/services/order_cart_reset.rb b/app/services/order_cart_reset.rb
index 4faec18a30..216a6fbbc1 100644
--- a/app/services/order_cart_reset.rb
+++ b/app/services/order_cart_reset.rb
@@ -30,7 +30,6 @@ class OrderCartReset
     return unless current_user
 
     order.associate_user!(current_user) if order.user.blank? || order.email.blank?
-    order.__send__(:associate_customer) if order.customer.nil? # Only associates existing customers
   end
 
   def reset_order_cycle(current_customer)