diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php
index d6c80f9..985f1ba 100644
--- a/core/modules/user/lib/Drupal/user/Entity/User.php
+++ b/core/modules/user/lib/Drupal/user/Entity/User.php
@@ -412,9 +412,7 @@ public function isAnonymous() {
    * {@inheritdoc}
    */
   public function getUsername() {
-    $name = $this->get('name')->value ?: \Drupal::config('user.settings')->get('anonymous');
-    \Drupal::moduleHandler()->alter('user_format_name', $name, $this);
-    return $name;
+    return $this->get('name')->value ?: \Drupal::config('user.settings')->get('anonymous');
   }
 
   /**
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 5dacd11..49e7658 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -163,7 +163,9 @@ function user_uri($user) {
  * @see user_format_name()
  */
 function user_label($entity_type, $entity) {
-  return $entity->getUsername();
+  $name = $entity->getUsername();
+  \Drupal::moduleHandler()->alter('user_format_name', $name, $this);
+  return $name;
 }
 
 /**