diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e6670bd8de5..712ded1cc41 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3689,6 +3689,8 @@ function get_all_user_name_fields($returnsql = false, $tableprefix = null, $pref
 /**
  * Reduces lines of duplicated code for getting user name fields.
  *
+ * See also {@link user_picture::unalias()}
+ *
  * @param object $addtoobject Object to add user name fields to.
  * @param object $secondobject Object that contains user name field information.
  * @param string $prefix prefix to be added to all fields (including $additionalfields) e.g. authorfirstname.
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 92623c7d98b..27936031a0e 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -364,7 +364,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
     $params['timestart'] = $timestart;
     $params['glossaryid'] = $cm->instance;
 
-    $ufields = user_picture::fields('u');
+    $ufields = user_picture::fields('u', null, 'useridagain');
     $entries = $DB->get_records_sql("
               SELECT ge.id AS entryid, ge.*, $ufields
                 FROM {glossary_entries} ge
@@ -399,8 +399,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
         }
 
         $tmpactivity                       = new stdClass();
-        $tmpactivity->user = username_load_fields_from_object(new stdClass(), $entry, null,
-                explode(',', user_picture::fields()));
+        $tmpactivity->user                 = user_picture::unalias($entry, null, 'useridagain');
         $tmpactivity->user->fullname       = fullname($tmpactivity->user, $viewfullnames);
         $tmpactivity->type                 = 'glossary';
         $tmpactivity->cmid                 = $cm->id;
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index d1afdb84d45..93a389399f2 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -854,7 +854,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
     $params['timestart'] = $timestart;
     $params['quizid'] = $quiz->id;
 
-    $ufields = user_picture::fields('u');
+    $ufields = user_picture::fields('u', null, 'useridagain');
     if (!$attempts = $DB->get_records_sql("
               SELECT qa.*,
                      {$ufields}
@@ -927,8 +927,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
             $tmpactivity->content->maxgrade  = null;
         }
 
-        $tmpactivity->user = username_load_fields_from_object(new stdClass(), $attempt, null,
-                explode(',', user_picture::fields()));
+        $tmpactivity->user = user_picture::unalias($attempt, null, 'useridagain');
         $tmpactivity->user->fullname  = fullname($tmpactivity->user, $viewfullnames);
 
         $activities[$index++] = $tmpactivity;