diff --git includes/form.inc includes/form.inc
index 41967f9..1892bf5 100644
--- includes/form.inc
+++ includes/form.inc
@@ -1130,10 +1130,14 @@ function form_set_error($name = NULL, $message = '', $limit_validation_errors =
       }
     }
     if ($record) {
-      $form[$name] = $message;
+      $form[$name] = !$message ? 'error' : $message;
       if ($message) {
+        $form[$name] = $message;
         drupal_set_message($message, 'error');
       }
+      else {
+        $form[$name] = $name . ': error';
+      }
     }
   }