diff --git a/comment/locallib.php b/comment/locallib.php
index d56d954aef3fc..606d3354724fa 100644
--- a/comment/locallib.php
+++ b/comment/locallib.php
@@ -61,7 +61,8 @@ function get_comments($page) {
         }
         $comments = array();
 
-        $sql = "SELECT c.id, c.contextid, c.itemid, c.commentarea, c.userid, c.content, u.firstname, u.lastname, c.timecreated
+        $usernamefields = get_all_user_name_fields(true, 'u');
+        $sql = "SELECT c.id, c.contextid, c.itemid, c.commentarea, c.userid, c.content, $usernamefields, c.timecreated
                   FROM {comments} c
                   JOIN {user} u
                        ON u.id=c.userid
@@ -74,8 +75,9 @@ function get_comments($page) {
             $item->time = userdate($item->timecreated);
             $item->content = format_text($item->content, FORMAT_MOODLE, $formatoptions);
             // Unset fields not related to the comment
-            unset($item->firstname);
-            unset($item->lastname);
+            foreach (get_all_user_name_fields() as $namefield) {
+                unset($item->$namefield);
+            }
             unset($item->timecreated);
             // Record the comment
             $comments[] = $item;