diff --git a/lib.php b/lib.php
index 5b08a4cb..332c4e63 100644
--- a/lib.php
+++ b/lib.php
@@ -728,9 +728,9 @@ function certificate_get_issues($certificateid, $sort="ci.timecreated ASC", $gro
     // Get all the users that have certificates issued, should only be one issue per user for a certificate
     $allparams = $conditionsparams + array('certificateid' => $certificateid);
 
-    $namefields = get_all_user_name_fields(true, 'u');
+    // The picture fields also include the name fields for the user.
     $picturefields = user_picture::fields('u');
-    $users = $DB->get_records_sql("SELECT u.id, u.idnumber, $namefields, $picturefields, ci.code, ci.timecreated
+    $users = $DB->get_records_sql("SELECT $picturefields, u.idnumber, ci.code, ci.timecreated
                                      FROM {user} u
                                INNER JOIN {certificate_issues} ci
                                        ON u.id = ci.userid