diff --git a/assignment/tool/src/webapp/js/assignmentsByStudent.js b/assignment/tool/src/webapp/js/assignmentsByStudent.js
index 452dfab695cb..ba79eb005404 100644
--- a/assignment/tool/src/webapp/js/assignmentsByStudent.js
+++ b/assignment/tool/src/webapp/js/assignmentsByStudent.js
@@ -45,6 +45,7 @@ function parseDataCell(html) {
   const expanded = cell.getAttribute("data-expanded") == "true";
   const actionLink = cell.getAttribute("data-action-href");
   const studentUserId = cell.getAttribute("data-user-id");
+  const userPhotoLabel = cell.getAttribute("data-user-photo-label");
   const studentName = cell.innerText.trim();
 
   return {
@@ -52,15 +53,20 @@ function parseDataCell(html) {
     expanded,
     studentName,
     studentUserId,
+    userPhotoLabel,
   };
 }
 
-function renderGrouping({ studentName, actionLink, expanded, studentUserId }) {
+function renderGrouping({ studentName, actionLink, expanded, studentUserId, userPhotoLabel }) {
   const template = document.createElement('template');
   template.innerHTML = `
     <tr>
       <td class="border-0">
-        <a href="${actionLink}" id="${studentUserId}">
+        <sakai-user-photo class="mx-2" user-id="${studentUserId}"
+                          label="${userPhotoLabel}"
+                          profile-popup="on"
+        </sakai-user-photo>
+        <a href="${actionLink}" id="${studentUserId}" class="d-inline-block mt-1">
           <span class="expand-icon si ${expanded ? "si-expanded" : "si-collapsed"}"
               aria-hidden="true"></span>
           <span>${studentName}</span>
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
index c21149051aee..e19678643569 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
@@ -123,6 +123,7 @@
 											data-action-href='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'
 										#end
 											data-expanded="$isExpanded"
+											data-user-photo-label="$tlang.getFormattedMessage("grading.userphoto", $member.displayName)"
 									>
 										$submitterName
 									</span>
@@ -160,6 +161,7 @@
 													data-action-href='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'
 												#end
 												data-expanded="$isExpanded"
+												data-user-photo-label="$tlang.getFormattedMessage("grading.userphoto", $member.displayName)"
 											>
 												$submitterName
 											</span>