diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index 2db5d51..0405303 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -465,7 +465,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
         // No Length constraint here because the UserName constraint also covers
         // that.
         'UserName' => array(),
-        'UniqueField' => array('message' => 'The username %value is already taken.'),
+        'UniqueField' => array(),
       ));
 
     $fields['pass'] = BaseFieldDefinition::create('password')
@@ -477,7 +477,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t('Email'))
       ->setDescription(t('The email of this user.'))
       ->setDefaultValue('')
-      ->addConstraint('UniqueField', ['message' => 'The email address %value is already taken.'])
+      ->addConstraint('UniqueField', [])
       ->addConstraint('UserMailRequired')
       ->addConstraint('ProtectedUserField');
 
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
index 09e3288..c906267 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -115,5 +115,4 @@ public function testUserAdd() {
       $this->assertEqual($user->isActive(), 'User is not blocked');
     }
   }
-
 }