Index: includes/handlers/gateways/pay_method_gateway.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pay/includes/handlers/gateways/pay_method_gateway.inc,v
retrieving revision 1.19
diff -u -r1.19 pay_method_gateway.inc
--- includes/handlers/gateways/pay_method_gateway.inc	27 Sep 2010 21:35:44 -0000	1.19
+++ includes/handlers/gateways/pay_method_gateway.inc	28 Sep 2010 02:21:52 -0000
@@ -336,23 +336,23 @@
   // This is called from the form_validate function in a pay_form class.
   function pay_method_validate($form, &$form_state, $element) {
     parent::pay_method_validate($form, $form_state, $element);
-    
+
     if ($this->payment_type == 'cc') {
       // Validate the card number and set the form value to our clean version.
       if (!$this->cc_number_validate()) {
-        form_set_error('cc_number', $this->error_message);
+        form_error($element['cc_number'], $this->error_message);
       }
       form_set_value($element['cc_number'], $this->cc_number, $form_state);
-  
+
       // Validate the CCV2 code and set the form value to our clean version.
       if (!$this->cc_ccv2_validate()) {
-        form_set_error('cc_ccv2', $this->error_message);
+        form_error($element['cc_ccv2'], $this->error_message);
       }
       form_set_value($element['cc_ccv2'], $this->cc_ccv2, $form_state);
-  
+
       // Validate the expiration date.
       if (!$this->cc_expiration_validate()) {
-        form_set_error('cc_exp_month', $this->error_message);
+        form_error($element['cc_exp_month'], $this->error_message);
       }
 
       // Set the "payment_type" value to the specific card type.
Index: includes/handlers/pay_method.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pay/includes/handlers/pay_method.inc,v
retrieving revision 1.10
diff -u -r1.10 pay_method.inc
--- includes/handlers/pay_method.inc	16 Jun 2010 15:43:03 -0000	1.10
+++ includes/handlers/pay_method.inc	28 Sep 2010 02:21:52 -0000
@@ -113,7 +113,7 @@
     // Confirm that the amount falls within our min/max settings.
     if (($this->total < $this->min_amount) || ($this->total > $this->max_amount) ) {
       $error = t('The %method payment method requires an amount between %min and %max', array('%method' => $this->title(), '%min' =>$this->min_amount, '%max' => $this->max_amount));
-      form_set_error('total', $error);
+      form_error($element['total'], $error);
     }
   }
 }
