diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 10a0f23671..35a2963871 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1358,7 +1358,7 @@ function user_form_process_password_reveal($element) {
       'fair' => t('Fair'),
       'good' => t('Good'),
       'strong' => t('Strong'),
-      'username' => \Drupal::currentUser()->getUsername(),
+      'username' => \Drupal::currentUser()->getAccountName(),
     ];
   }