diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
index cf61815..ce0d20e 100644
--- a/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -427,7 +427,7 @@ public static function getAnonymousUser() {
 
       static::$anonymousUser = new $class([
         'uid' => [LanguageInterface::LANGCODE_DEFAULT => 0],
-        'name' => [LanguageInterface::LANGCODE_DEFAULT => '']
+        'name' => [LanguageInterface::LANGCODE_DEFAULT => ''],
       ], $entity_type->id());
     }
     return clone static::$anonymousUser;
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 6f304ff..a19acc6 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -739,7 +739,7 @@ function _user_cancel($edit, $account, $method) {
       }
       $account->block();
       $account->save();
-      drupal_set_message(t('%name has been disabled.', array('%name' => $account->getAccountName())));
+      drupal_set_message(t('%name has been disabled.', array('%name' => $account->getDisplayName())));
       $logger->notice('Blocked user: %name %email.', array('%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>'));
       break;
 
@@ -750,7 +750,7 @@ function _user_cancel($edit, $account, $method) {
         _user_mail_notify('status_canceled', $account);
       }
       $account->delete();
-      drupal_set_message(t('%name has been deleted.', array('%name' => $account->getAccountName())));
+      drupal_set_message(t('%name has been deleted.', array('%name' => $account->getDisplayName())));
       $logger->notice('Deleted user: %name %email.', array('%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>'));
       break;
   }