Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java
===================================================================
diff -u -rd6cc136dd301517f59c05b2ba254a4538dae65aa -r6ea65384311c0e9e85c3783f311f594f79aa63d0
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision d6cc136dd301517f59c05b2ba254a4538dae65aa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(.../PortraitSaveController.java)	(revision 6ea65384311c0e9e85c3783f311f594f79aa63d0)
@@ -162,6 +162,13 @@
 	user.setPortraitUuid(UUID.fromString(originalFileNode.getUuid()));
 	userManagementService.saveUser(user);
 
+	// apply also to logged in user
+	HttpSession session = request.getSession();
+	UserDTO userDTO = (UserDTO) session.getAttribute(AttributeNames.USER);
+	if (userDTO != null && userDTO.getUserID().equals(user.getUserId())) {
+	    userDTO.setPortraitUuid(originalFileNode.getUuid());
+	}
+
 	return "forward:/index.do?redirect=portrait";
     }
 
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r3b73fca4dac9dbd51f0b319791e477683203073c -r6ea65384311c0e9e85c3783f311f594f79aa63d0
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 3b73fca4dac9dbd51f0b319791e477683203073c)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 6ea65384311c0e9e85c3783f311f594f79aa63d0)
@@ -1343,7 +1343,7 @@
 			var activity = null;
 			if (!onlyDetachedLeft) {
 				$.each(activitiesCopy, function(){
-					if (this.transitions.to.length > 0) {
+					if (this.transitions && this.transitions.to.length > 0) {
 						activity = this;
 						// crawl back using "to" transition all the way to the beggining of sequence
 						while (activity.transitions.to.length > 0) {
@@ -3449,4 +3449,4 @@
 		 var snapped = Snap.snapTo(layout.snapToGrid.step, input, layout.snapToGrid.step / 2);
 		 return skipPadding ? snapped : Math.max(snapped, layout.snapToGrid.padding);
 	 }
-};
+};
\ No newline at end of file
Index: lams_learning/web/includes/javascript/learnerPage.js
===================================================================
diff -u -r5f67599f295e781562654e755026d3caf3b0aa6c -r6ea65384311c0e9e85c3783f311f594f79aa63d0
--- lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision 5f67599f295e781562654e755026d3caf3b0aa6c)
+++ lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision 6ea65384311c0e9e85c3783f311f594f79aa63d0)
@@ -6,7 +6,7 @@
         topToggleButton.attr('aria-expanded', !isExpanded)
             .children('i').toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class'));
         $('.component-page-wrapper .component-sidebar').toggleClass('active').attr('aria-expanded', !isExpanded);
-		$('.component-sidebar').focus();
+        $('.component-sidebar').focus();
     });
 
     $.ajax({
@@ -88,31 +88,4 @@
             $('#progress-bar-widget-value').text(progressBarWidgetValue + '%');
         }
     });
-}
-
-function showMyProfileDialog() {
-    let dialog = showDialog("dialogMyProfile", {
-        'title' : "My profile",
-        'modal' : true,
-        'width' : Math.max(380, Math.min(1000, $(window).width() - 60)),
-        'height' : 430,
-        'open' : function() {
-            var dialog = $(this);
-            // load contents after opening the dialog
-            $('iframe', dialog).attr({'src': LAMS_URL + 'index.do?redirect=profile',
-                'id' : 'myProfileModal'});
-
-            // in case of mobile devices allow iframe scrolling
-            if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
-                setTimeout(function() {
-                    dialog.css({
-                        'overflow-y' : 'scroll',
-                        '-webkit-overflow-scrolling' : 'touch'
-                    });
-                },500);
-            }
-        }
-    });
-
-    dialog.children('.modal-dialog').addClass('modal-lg');
-}
+}
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -re79e55dbcff10c82a36fcd5a6d902f23af4676e3 -r6ea65384311c0e9e85c3783f311f594f79aa63d0
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision e79e55dbcff10c82a36fcd5a6d902f23af4676e3)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 6ea65384311c0e9e85c3783f311f594f79aa63d0)
@@ -81,7 +81,7 @@
                         </div>
                     </div>
                     <button id="profile-picture" class="no-decoration px-3 py-1" type="button"
-                            onclick="javascript:showMyProfileDialog()">
+                            onclick="javascript:showMyPortraitDialog()">
                         <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" aria-label="<c:out value="${pageLearnerFirstName} ${pageLearnerLastName}" escapeXml="true"/> profile picture" alt="User profile picture">
                     </button>
                 </div>
@@ -121,4 +121,4 @@
     </div>
     </body>
 
-</lams:html>
+</lams:html>
\ No newline at end of file