diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 577fd3648c996..67e6db0619d74 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -2266,8 +2266,8 @@
 $string['weekhide'] = 'Hide this week from {$a}';
 $string['weeklyoutline'] = 'Weekly outline';
 $string['weekshow'] = 'Show this week to {$a}';
-$string['welcomeback'] = 'Welcome back, {$a}! 👋';
-$string['welcometosite'] = 'Welcome, {$a}! 👋';
+$string['welcomeback'] = 'Welcome back, {$a->firstname}! 👋';
+$string['welcometosite'] = 'Welcome, {$a->firstname}! 👋';
 $string['welcometocourse'] = 'Welcome to {$a}';
 $string['welcometocoursetext'] = 'Welcome to {$a->coursename}!
 
diff --git a/lib/classes/user.php b/lib/classes/user.php
index c1e81c63198fb..d22520999fecf 100644
--- a/lib/classes/user.php
+++ b/lib/classes/user.php
@@ -1189,7 +1189,17 @@ public static function welcome_message(): ?lang_string {
                 $messagekey = 'welcometosite';
                 set_user_preference('core_user_welcome', time());
             }
-            return new lang_string($messagekey, 'core', $USER->firstname);
+
+            $namefields = [
+                'fullname' => fullname($USER),
+                'alternativefullname' => fullname($USER, true),
+            ];
+
+            foreach (\core_user\fields::get_name_fields() as $namefield) {
+                $namefields[$namefield] = $USER->{$namefield};
+            }
+
+            return new lang_string($messagekey, 'core', $namefields);
         };
         return null;
     }