--- validation_api.module	2009-04-06 21:59:15.000000000 +-0400
+++ validation_api.module	2009-04-06 21:59:15.000000000 +-0400
@@ -533,13 +533,13 @@
     switch ($validator->type) {
       case 'php':
         // Run the PHP code validation.
         if (!eval($validator->rule)) {
           $message = $validation_api_field->message;
           // Set up the substitution strings for the message.
-          $substitutes['%field'] = $element['#name'];
+          $substitutes['%field'] = empty($element['#title']) ? $element['#name'] : $element['#title'];
           if (count($arguments) > 0) {
             foreach ($arguments as $delta => $argument) {
               $substitutes['%arguments['. $delta .']'] = $argument;
             }
           }
 
@@ -563,13 +563,13 @@
         }
 
         // Run the regular expression validation.
         if (!preg_match($validator->rule, $value)) {
           $message = $validation_api_field->message;
           // Set up the substitution strings for the message.
-          $substitutes['%field'] = $element['#name'];
+          $substitutes['%field'] = empty($element['#title']) ? $element['#name'] : $element['#title'];
           if (count($arguments) > 0) {
             foreach ($arguments as $delta => $argument) {
               $substitutes['%arguments['. $delta .']'] = $argument;
             }
           }