diff --git a/core/includes/form.inc b/core/includes/form.inc
index d63596e..4b1720e 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -4755,11 +4755,16 @@ function theme_form_element($variables) {
  * @ingroup themeable
  */
 function theme_form_required_marker($variables) {
-  $attributes = array(
-    'class' => 'form-required',
-    'title' => t('This field is required.'),
-  );
-  return '<abbr' . new Attribute($attributes) . '>*</abbr>';
+  if (!empty($variables['element']['#required'])) {
+    $attributes = array(
+      'class' => 'form-required',
+      'title' => t('This field is required.'),
+    );
+    return '<abbr' . new Attribute($attributes) . '>*</abbr>';
+  }
+  else {
+    return '';
+  }
 }
 
 /**
@@ -4794,7 +4799,7 @@ function theme_form_element_label($variables) {
   }
 
   // If the element is required, a required marker is appended to the label.
-  $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : '';
+  $required = theme('form_required_marker', array('element' => $element));
 
   $title = filter_xss_admin($element['#title']);