diff --git a/core/includes/form.inc b/core/includes/form.inc
index 779457e..88f7681 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -4768,11 +4768,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 ($variables['element']['#required']) {
+    $attributes = array(
+      'class' => 'form-required',
+      'title' => t('This field is required.'),
+    );
+    return '<abbr' . new Attribute($attributes) . '>*</abbr>';
+  }
+  else {
+    return '';
+  }
 }
 
 /**
@@ -4807,8 +4812,11 @@ function theme_form_element_label($variables) {
   }
 
   // If the element is required, a required marker is appended to the label.
-  $form_required_marker = array('#theme' => 'form_required_marker') + $element;
-  $required = !empty($element['#required']) ? drupal_render($form_required_marker) : '';
+  $form_required_marker = array(
+    '#theme' => 'form_required_marker',
+    '#required' => !empty($element['#required']),
+  );
+  $required = drupal_render($form_required_marker);
 
   $title = filter_xss_admin($element['#title']);