diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Validation/Constraint/CommentNameConstraintValidator.php b/core/modules/comment/lib/Drupal/comment/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
index fe3ae54..94d59b5 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
@@ -21,12 +21,10 @@ class CommentNameConstraintValidator extends ConstraintValidator {
   public function validate($field_item, Constraint $constraint) {
     $author_name = $field_item->value;
     if (isset($author_name) && ($author_name !== '')) {
-      // @todo Improve DX of this after https://drupal.org/node/2078387.
-      $author_is_unauthenticated = ($field_item->getEntity()->uid->value === 0);
-
       // Do not allow unauthenticated comment authors to use a name that is
       // taken by a registered user.
-      if ($author_is_unauthenticated) {
+      if ($field_item->getEntity()->getOwnerId() === 0) {
+        // @todo Properly inject dependency https://drupal.org/node/2197029
         $users = \Drupal::entityManager()->getStorageController('user')->loadByProperties(array('name' => $author_name));
         if (!empty($users)) {
           $this->context->addViolation($constraint->message, array('%name' => $author_name));