Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r65cf859cfb422d73341df794df86dc8ece2f926b -r1c914aba313ca9ecb5e7da623d7d97483cbac9b1
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 65cf859cfb422d73341df794df86dc8ece2f926b)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 1c914aba313ca9ecb5e7da623d7d97483cbac9b1)
@@ -23,8 +23,6 @@
         <c:set var="pageLearnerPortraitSrc">${lams}images/css/john-doe-portrait.jpg</c:set>
     </c:otherwise>
 </c:choose>
-<c:set var="pageLearnerFirstName"><lams:user property="firstName" /></c:set>
-<c:set var="pageLearnerLastName"><lams:user property="lastName" /></c:set>
 
 <lams:html>
     <lams:head>
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r65cf859cfb422d73341df794df86dc8ece2f926b -r1c914aba313ca9ecb5e7da623d7d97483cbac9b1
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 65cf859cfb422d73341df794df86dc8ece2f926b)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 1c914aba313ca9ecb5e7da623d7d97483cbac9b1)
@@ -25,6 +25,15 @@
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="learnerAppUrl"><lams:WebAppURL /></c:set>
 <c:set var="title"><fmt:message key="learner.title" /></c:set>
+<c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
+<c:choose>
+    <c:when test="${not empty pageLearnerPortraitUuid}">
+        <c:set var="pageLearnerPortraitSrc">${lams}download/?uuid=${pageLearnerPortraitUuid}&preferDownload=false&version=4</c:set>
+    </c:when>
+    <c:otherwise>
+        <c:set var="pageLearnerPortraitSrc">${lams}images/css/john-doe-portrait.jpg</c:set>
+    </c:otherwise>
+</c:choose>
 
 <lams:PageLearner title="${title}" toolSessionID="" hideHeader="true" hideTitle="true">
 	<style>
@@ -96,7 +105,7 @@
 
 			<div class="top-menu">
 				<button id="profile-picture" class="btn btn-light no-decoration d-none d-sm-block px-md-3 disabled" type="button" disabled>
-					<img class="portrait-sm portrait-round" src="${lams}images/css/john-doe-portrait.jpg" alt="Your profile portrait">
+					<img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 				</button>
 		                    
 				<button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block disabled" disabled>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r65cf859cfb422d73341df794df86dc8ece2f926b -r1c914aba313ca9ecb5e7da623d7d97483cbac9b1
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 65cf859cfb422d73341df794df86dc8ece2f926b)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 1c914aba313ca9ecb5e7da623d7d97483cbac9b1)
@@ -23,8 +23,6 @@
         <c:set var="pageLearnerPortraitSrc">${lams}images/css/john-doe-portrait.jpg</c:set>
     </c:otherwise>
 </c:choose>
-<c:set var="pageLearnerFirstName"><lams:user property="firstName" /></c:set>
-<c:set var="pageLearnerLastName"><lams:user property="lastName" /></c:set>
 
 <lams:html>
     <lams:head>