diff --git a/includes/TimelessTemplate.php b/includes/TimelessTemplate.php
index 7b41bec..f0682f7 100644
--- a/includes/TimelessTemplate.php
+++ b/includes/TimelessTemplate.php
@@ -416,6 +416,8 @@ class TimelessTemplate extends BaseTemplate {
 	protected function getUserLinks() {
 		$user = $this->getSkin()->getUser();
 		$personalTools = $this->getPersonalTools();
+		// Preserve standard username label to allow customisation (T215822)
+		$userName = $personalTools['userpage']['links'][0]['text'] ?? $user->getName();
 
 		$html = '';
 		$extraTools = [];
@@ -441,7 +443,6 @@ class TimelessTemplate extends BaseTemplate {
 
 		// Labels
 		if ( $user->isLoggedIn() ) {
-			$userName = $user->getName();
 			// Make sure it fits first (numbers slightly made up, may need adjusting)
 			$fit = empty( $extraTools ) ? 13 : 9;
 			if ( mb_strlen( $userName ) < $fit ) {
@@ -449,7 +450,7 @@ class TimelessTemplate extends BaseTemplate {
 			} else {
 				$dropdownHeader = $this->getMsg( 'timeless-loggedin' )->text();
 			}
-			$headerMsg = [ 'timeless-loggedinas', $user->getName() ];
+			$headerMsg = [ 'timeless-loggedinas', $userName ];
 		} else {
 			$dropdownHeader = $this->getMsg( 'timeless-anonymous' )->text();
 			$headerMsg = 'timeless-notloggedin';