diff --git a/admin/creators.php b/admin/creators.php
index f7f93dc4ef2..3421acc3429 100755
--- a/admin/creators.php
+++ b/admin/creators.php
@@ -127,9 +127,10 @@
         }
 
         foreach ($users as $user) {
+            $fullname = fullname($user, TRUE);
             echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
                    "title=\"$straddcreator\"><img src=\"../pix/t/left.gif\"".
-                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+                   "border=0></a>&nbsp;&nbsp;$fullname, $user->email";
         }
     }
 
diff --git a/admin/register.php b/admin/register.php
index 46bf5181f45..ba2c3faf8b6 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -101,7 +101,7 @@
 
     echo "<tr valign=top>\n";
     echo "<td align=right><p>".get_string("administrator").":</td>\n";
-    echo "<td><p><input size=50 type=\"text\" name=\"adminname\" value=\"$admin->firstname $admin->lastname\"></td>\n";
+    echo "<td><p><input size=50 type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\"></td>\n";
     echo "</tr>\n";
 
     echo "<tr valign=top>\n";
diff --git a/admin/user.php b/admin/user.php
index b176fb42f7c..06e2f275a47 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -135,9 +135,9 @@
                     unenrol_student($user->id);  // From all courses
                     remove_teacher($user->id);   // From all courses
                     remove_admin($user->id);
-                    notify(get_string("deletedactivity", "", "$user->firstname $user->lastname"));
+                    notify(get_string("deletedactivity", "", fullname($user, true) );
                 } else {
-                    notify(get_string("deletednot", "", "$user->firstname $user->lastname"));
+                    notify(get_string("deletednot", "", fullname($user, true));
                 }
             }
         }
@@ -256,7 +256,8 @@
             } else {
                 $strlastaccess = get_string("never");
             }
-            $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&course=$site->id\">$user->firstname $user->lastname</a>",
+            $fullname = fullname($user, true);
+            $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&course=$site->id\">$fullname</a>",
                              "$user->email",
                              "$user->city",
                              "$user->country",