diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
index 9baa5c5..02b060a 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
@@ -78,38 +78,23 @@ public function form(array $form, array &$form_state, EntityInterface $comment)
     }
 
     // Add the author name field depending on the current user.
+    $form['author']['name'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Your name'),
+      '#default_value' => $author,
+      '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
+      '#maxlength' => 60,
+      '#size' => 30,
+    );
     if ($is_admin) {
-      $form['author']['name'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Authored by'),
-        '#default_value' => $author,
-        '#maxlength' => 60,
-        '#size' => 30,
-        '#description' => t('Leave blank for %anonymous.', array('%anonymous' => config('user.settings')->get('anonymous'))),
-        '#autocomplete_path' => 'user/autocomplete',
-      );
+      $form['author']['name']['#title'] = t('Authored by');
+      $form['author']['name']['#description'] = t('Leave blank for %anonymous.', array('%anonymous' => config('user.settings')->get('anonymous')));
+      $form['author']['name']['#autocomplete_path'] = 'user/autocomplete';
     }
     elseif ($user->uid) {
-      $form['author']['_author'] = array(
-        '#type' => 'item',
-        '#title' => t('Your name'),
-        '#markup' => theme('username', array('account' => $user)),
-      );
-
-      $form['author']['name'] = array(
-        '#type' => 'value',
-        '#value' => $author,
-      );
-    }
-    else {
-      $form['author']['name'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Your name'),
-        '#default_value' => $author,
-        '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
-        '#maxlength' => 60,
-        '#size' => 30,
-      );
+      $form['author']['name']['#type'] = 'item';
+      $form['author']['name']['#value'] = $form['author']['name']['#default_value'];
+      $form['author']['name']['#markup'] = theme('username', array('account' => $user));
     }
 
     // Add author e-mail and homepage fields depending on the current user.