diff --git a/course/student.php b/course/student.php
index bdb9812e076..1fa5d28c088 100644
--- a/course/student.php
+++ b/course/student.php
@@ -98,7 +98,8 @@
         $studentarray = array();
         foreach ($students as $student) {
             $studentarray[] = $student->id;
-            echo "<p align=right>$student->firstname $student->lastname, $student->email &nbsp;&nbsp; <a href=\"student.php?id=$course->id&remove=$student->id\" title=\"$strremovestudent\"><img src=\"../pix/t/right.gif\" border=0></a></p>";
+            $fullname = fullname($student, true);
+            echo "<p align=right>$fullname, $student->email &nbsp;&nbsp; <a href=\"student.php?id=$course->id&remove=$student->id\" title=\"$strremovestudent\"><img src=\"../pix/t/right.gif\" border=0></a></p>";
         }
         $studentlist = implode(",",$studentarray);
         unset($studentarray);
@@ -128,9 +129,10 @@
         }
 
         foreach ($users as $user) {
+            $fullname = fullname($user, true);
             echo "<p align=left><a href=\"student.php?id=$course->id&add=$user->id\"".
                    "title=\"$straddstudent\"><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/course/teacher.php b/course/teacher.php
index 5011035d643..1c617496b14 100644
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -156,7 +156,7 @@
                 $teacher->role = $course->teacher;
             }
     
-            $table->data[] = array ($picture, "$teacher->firstname $teacher->lastname", $authority,
+            $table->data[] = array ($picture, fullname($teacher, true), $authority,
                                     "<input type=text name=\"r$teacher->id\" value=\"$teacher->role\" size=30>",
                                     $editall, $removelink);
         }
@@ -203,7 +203,7 @@
         foreach ($users as $user) {
             $addlink = "<a href=\"teacher.php?id=$course->id&add=$user->id\">$straddteacher</a>";
             $picture = print_user_picture($user->id, $course->id, $user->picture, false, true);
-            $table->data[] = array ($picture, "$user->firstname $user->lastname", $user->email, $addlink);
+            $table->data[] = array ($picture, fullname($user, true), $user->email, $addlink);
         }
         print_table($table);
     }