diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index 1dcdefb..2e273d8 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -474,9 +474,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t('Name'))
       ->setDescription(t('The name of this user.'))
       ->setRequired(TRUE)
+      ->setSetting('max_length', USERNAME_MAX_LENGTH)
       ->setConstraints(array(
-        // No Length constraint here because the UserName constraint also covers
-        // that.
         'UserName' => array(),
         'UserNameUnique' => array(),
       ));