diff --git a/login/index.php b/login/index.php
index 297d3e9fdde..c64c53b5fbc 100644
--- a/login/index.php
+++ b/login/index.php
@@ -38,7 +38,8 @@
             $USER->site = $CFG->wwwroot;   // for added security
             
             if ($USER->username == "guest") {
-                $USER->lang = $CFG->lang;  // Guest language always same as site
+                $USER->lang       = $CFG->lang;               // Guest language always same as site
+                $USER->firstname  = get_string("guestuser");  // Name always in current language
             }
     
             if (!update_user_in_db()) {