diff --git a/modules/customer/commerce_customer.module b/modules/customer/commerce_customer.module
index 9d22c2b..742d580 100644
--- a/modules/customer/commerce_customer.module
+++ b/modules/customer/commerce_customer.module
@@ -1320,9 +1320,8 @@ function commerce_customer_profile_copy_validate($element, &$form_state, $form)
     commerce_order_save($form_state['order']);
   }
 
-  // Checkbox: On - Only invoked for the corresponding trigger element, or the
-  // "continue" checkout form button.
-  elseif ((($triggering_element == 'commerce_customer_profile_copy' && $form_state['triggering_element']['#id'] == $element['#id']) || $triggering_element == 'continue') && !empty($element['#value'])) {
+  // Checkbox: On - Only invoked when customer profile copy is enabled.
+  elseif (!empty($form_state['values'][$pane_id]['commerce_customer_profile_copy'])) {
     $type = substr($pane_id, 17);  // Removes 'customer_profile_'
     $source_id = 'customer_profile_' . variable_get('commerce_' . $pane_id . '_profile_copy_source', '');
     $info = array('commerce_customer_profile', $type, $pane_id);