diff --git a/components/date.inc b/components/date.inc
index 306d95a..8428313 100644
--- a/components/date.inc
+++ b/components/date.inc
@@ -405,7 +405,8 @@ function webform_validate_date($element, $form_state) {
     // Check that each part of the date has been filled in.
     foreach (array('day', 'month', 'year') as $field_type) {
       if (empty($element[$field_type]['#value'])) {
-        form_error($element[$field_type], t('!part in !name is missing.', array('!name' => $element['#title'], '!part' => $element[$field_type]['#title'])));
+        form_error($element, t('Entered !name is not a valid date.', array('!name' => $element['#title'])));
+        form_error($element[$field_type], '');
         $missing_fields = TRUE;
       }
     }