diff --git a/mod/quiz/override_form.php b/mod/quiz/override_form.php
index 80976ecef61..7b1172ac3d4 100644
--- a/mod/quiz/override_form.php
+++ b/mod/quiz/override_form.php
@@ -141,13 +141,13 @@ class quiz_override_form extends moodleform {
                     $groups = groups_get_all_groups($cm->course, 0, $cm->groupingid);
                     if (!empty($groups)) {
                         $users = get_users_by_capability($this->context, 'mod/quiz:attempt',
-                                'u.id, u.firstname, u.lastname, u.email',
+                                'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
                                 $sort, '', '', array_keys($groups),
                                 '', false, true);
                     }
                 } else {
                     $users = get_users_by_capability($this->context, 'mod/quiz:attempt',
-                            'u.id, u.firstname, u.lastname, u.email' ,
+                            'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
                             $sort, '', '', '', '', false, true);
                 }
                 if (empty($users)) {
diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index 260c84b4753..bb7e4e77560 100644
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -99,11 +99,11 @@ if ($groupmode) {
 } else {
     $colname = get_string('user');
     list($sort, $params) = users_order_by_sql('u');
-    $sql = 'SELECT o.*, u.firstname, u.lastname
-                FROM {quiz_overrides} o
-                JOIN {user} u ON o.userid = u.id
-                WHERE o.quiz = :quizid
-                ORDER BY ' . $sort;
+    $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+            FROM {quiz_overrides} o
+            JOIN {user} u ON o.userid = u.id
+            WHERE o.quiz = :quizid
+            ORDER BY ' . $sort;
     $params['quizid'] = $quiz->id;
 }