diff --git a/lib/completionlib.php b/lib/completionlib.php
index e22d81b67dc..9dbf9f0bf5f 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -1150,7 +1150,8 @@ class completion_info {
                 context_course::instance($this->course->id),
                 'moodle/course:isincompletionreports', $groupid, true);
 
-        $sql = 'SELECT u.id, u.firstname, u.lastname, u.idnumber';
+        $allusernames = get_all_user_name_fields(true, 'u');
+        $sql = 'SELECT u.id, u.idnumber, ' . $allusernames;
         if ($extracontext) {
             $sql .= get_extra_user_fields_sql($extracontext, 'u', '', array('idnumber'));
         }