diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index e9ef8393162..4fc233dbcd2 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -735,9 +735,9 @@ class assign_grading_table extends table_sql implements renderable {
         if (!$this->is_downloading()) {
             $courseid = $this->assignment->get_course()->id;
             $link= new moodle_url('/user/view.php', array('id' =>$row->id, 'course'=>$courseid));
-            $fullname = $this->output->action_link($link, fullname($row));
+            $fullname = $this->output->action_link($link, $this->assignment->fullname($row));
         } else {
-            $fullname = fullname($row);
+            $fullname = $this->assignment->fullname($row);
         }
 
         if (!$this->assignment->is_active_user($row->id)) {
@@ -757,7 +757,7 @@ class assign_grading_table extends table_sql implements renderable {
      */
     public function col_select(stdClass $row) {
         $selectcol = '<label class="accesshide" for="selectuser_' . $row->userid . '">';
-        $selectcol .= get_string('selectuser', 'assign', fullname($row));
+        $selectcol .= get_string('selectuser', 'assign', $this->assignment->fullname($row));
         $selectcol .= '</label>';
         $selectcol .= '<input type="checkbox"
                               id="selectuser_' . $row->userid . '"
@@ -822,11 +822,7 @@ class assign_grading_table extends table_sql implements renderable {
         $gradingdisabled = $this->assignment->grading_disabled($row->id);
 
         if (!$this->is_downloading() && $this->hasgrade) {
-            $name = fullname($row);
-            if ($this->assignment->is_blind_marking()) {
-                $name = get_string('hiddenuser', 'assign') .
-                        $this->assignment->get_uniqueid_for_user($row->userid);
-            }
+            $name = $this->assignment->fullname($row);
             $icon = $this->output->pix_icon('gradefeedback',
                                             get_string('gradeuser', 'assign', $name),
                                             'mod_assign');
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 4779c0fe15b..65c4d4777a2 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3231,9 +3231,9 @@ class assign {
      * @param stdClass $user The user record as required by fullname()
      * @return string The name.
      */
-    protected function fullname($user) {
+    public function fullname($user) {
         if ($this->is_blind_marking()) {
-            $uniqueid = $this->get_uniqueid_for_user($userid);
+            $uniqueid = $this->get_uniqueid_for_user($user->id);
             return get_string('participant', 'assign') . ' ' . $uniqueid;
         } else {
             return fullname($user);