diff --git a/uc_extra_fields_pane.module b/uc_extra_fields_pane.module
index e7af639..6f7f99d 100644
--- a/uc_extra_fields_pane.module
+++ b/uc_extra_fields_pane.module
@@ -898,6 +898,17 @@ function uc_extra_fields_pane_form_uc_cart_checkout_form_alter(&$form, $form_sta
   // Apply weights
   module_load_include('inc', 'uc_extra_fields_pane', 'includes/weights');
   uc_extra_fields_pane_weight_uc_cart_checkout_form_alter($form, $form_state);
+  $form['#validate'][]='_uc_extra_fields_pane_form_uc_cart_checkout_form_validation';
+}
+function uc_extra_fields_pane_form_uc_order_edit_form_alter(&$form, $form_state) {
+  $form['#validate'][]='_uc_extra_fields_pane_form_uc_order_edit_form_validation';
+}
+require_once('uc_extra_fields_pane.ca.inc');
+function _uc_extra_fields_pane_form_uc_cart_checkout_form_validation($form, $form_state){
+  ca_pull_trigger('uc_extra_fields_pane_checkout_form_validation', $form_state);
+}
+function _uc_extra_fields_pane_form_uc_order_edit_form_validation($form, $form_state){
+  ca_pull_trigger('uc_extra_fields_pane_order_edit_form_validation', $form_state);
 }
 
 // -------------------------------------------------------------------