diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module
index 1f4b3fd..930ec8c 100644
--- a/modules/cart/commerce_cart.module
+++ b/modules/cart/commerce_cart.module
@@ -785,7 +785,7 @@ function commerce_cart_order_convert($order, $account) {
     $order_wrapper = entity_metadata_wrapper('commerce_order', $order);
 
     foreach (commerce_customer_profile_types() as $type => $profile_type) {
-      $field_name = 'commerce_customer_' . $type;
+      $field_name = variable_get('commerce_customer_profile_' . $type . '_field', '');
 
       if (!is_null($order_wrapper->{$field_name}->value()) &&
         $order_wrapper->{$field_name}->uid->value() == 0) {
diff --git a/modules/order/includes/commerce_order.forms.inc b/modules/order/includes/commerce_order.forms.inc
index 87abaa1..e3501c6 100644
--- a/modules/order/includes/commerce_order.forms.inc
+++ b/modules/order/includes/commerce_order.forms.inc
@@ -273,7 +273,7 @@ function commerce_order_order_form_submit($form, &$form_state) {
     $wrapper = entity_metadata_wrapper('commerce_order', $order);
 
     foreach ($entity_info['bundles'] as $profile_type => $data) {
-      $field_name = 'commerce_customer_' . $profile_type;
+      $field_name = variable_get('commerce_customer_profile_' . $profile_type . '_field', '');
 
       if (!is_null($wrapper->{$field_name}->value()) &&
         $wrapper->{$field_name}->uid->value() == 0) {