Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r30b838c2ace64169f440c86a9756fd0959cf2323 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 30b838c2ace64169f440c86a9756fd0959cf2323)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -419,7 +419,7 @@
 label.authoring.basic.import.word = MS Word
 label.monitoring.summary.answered.questions.y.axis.groups = Groups
 label.monitoring.summary.answered.questions.groups = Groups Progress
-label.monotoring.change.leader = Change leader
+label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
 label.authoring.basic.question.version = Version
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r30b838c2ace64169f440c86a9756fd0959cf2323 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 30b838c2ace64169f440c86a9756fd0959cf2323)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -4017,7 +4017,7 @@
 	AssessmentSession session = getSessionBySessionId(toolSessionId);
 
 	AssessmentUser existingLeader = session.getGroupLeader();
-	if (existingLeader != null && existingLeader.getUserId().equals(leaderUserId)) {
+	if (existingLeader == null || existingLeader.getUserId().equals(leaderUserId)) {
 	    return;
 	}
 	Assessment assessment = session.getAssessment();
Index: lams_tool_assessment/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_assessment/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -29,10 +29,13 @@
 			<fmt:message key="label.users.from.group" />
 		</div>
 		
-		<div>
-			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<div class="user">
-					<c:out value="${user.firstName}" escapeXml="true"/> <c:out value="${user.lastName}" escapeXml="true"/>
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.userId}"/>
+					<span>
+						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+					</span>
 				</div>
 			</c:forEach>
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r30b838c2ace64169f440c86a9756fd0959cf2323 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 30b838c2ace64169f440c86a9756fd0959cf2323)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -779,7 +779,7 @@
 					<c:if test="${assessment.useSelectLeaderToolOuput and sessionDto.numberLearners > 0 and not sessionDto.leaderFinished}">
 						<button type="button" class="btn btn-default btn-xs pull-right"
 								onClick="javascript:showChangeLeaderModal(${sessionDto.sessionId})">
-							<fmt:message key='label.monotoring.change.leader'/>
+							<fmt:message key='label.monitoring.change.leader'/>
 						</button>
 					</c:if>
 		        </div>
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
===================================================================
diff -u -r7eab6b4371036949ed61a387bc7706473895f567 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision 7eab6b4371036949ed61a387bc7706473895f567)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -138,6 +138,7 @@
 	    List<User> groupUserDtos = new ArrayList<>();
 	    for (DokumaranUser groupUser : groupUsers) {
 		User groupUserDto = new User();
+		groupUserDto.setUserId(groupUser.getUserId().intValue());
 		groupUserDto.setFirstName(groupUser.getFirstName());
 		groupUserDto.setLastName(groupUser.getLastName());
 		groupUserDtos.add(groupUserDto);
Index: lams_tool_doku/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
+++ lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -26,16 +26,16 @@
 		<div class="voffset5">
 			<fmt:message key="label.users.from.group" />
 		</div>
-
-		<div class="voffset5">
 		
-			<div class="roffset10">
-				<c:forEach var="user" items="${groupUsers}" varStatus="status">
-					<div class="user">
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.userId}"/>
+					<span>
 						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-					</div>
-				</c:forEach>
-			</div>
+					</span>
+				</div>
+			</c:forEach>
 		</div>
 
 		<div class="voffset10">
Index: lams_tool_lamc/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -26,11 +26,16 @@
 			<fmt:message key="label.users.from.group" />
 		</div>
 
-		<ul class="voffset2">
-			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<li><i class="fa fa-user"></i> <c:out value="${user.fullname}" escapeXml="true" /></li>
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.userId}"/>
+					<span>
+						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+					</span>
+				</div>
 			</c:forEach>
-		</ul>
+		</div>
 
 		<button name="refreshButton" onclick="refresh();" class="btn btn-primary pull-right">
 			<fmt:message key="label.refresh" />
Index: lams_tool_laqa/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r0b845931db55d90f0dcabc0b33cce5c7df688153 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 0b845931db55d90f0dcabc0b33cce5c7df688153)
+++ lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -27,14 +27,18 @@
 			<fmt:message key="label.users.from.group" />
 		</div>
 
-		<ul>
-			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<li><span class="user"> <c:out value="${user.fullname}" escapeXml="true" />
-				</span></li>
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.queUsrId}"/>
+					<span>
+						<c:out value="${user.fullname}" escapeXml="true" />
+					</span>
+				</div>
 			</c:forEach>
-		</ul>
+		</div>
 
-		<div class="right-buttons">
+		<div class="right-buttons pull-right">
 			<button onclick="refresh();" class="btn btn-default voffset5">
 				<fmt:message key="label.refresh" />
 			</button>
Index: lams_tool_leader/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rec9b0ffc2e88f3504fd7505ee8474f86d89a2458 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ec9b0ffc2e88f3504fd7505ee8474f86d89a2458)
+++ lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -60,4 +60,5 @@
 
 label.change.leader = Change leader
 label.note.leader.change = Note that the leader change only will take place for the activities in which the existing leader has not been set or commenced.
-label.current.leader = Current leader:
\ No newline at end of file
+label.current.leader = Current leader:
+label.current.leader.none = none
\ No newline at end of file
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -ra65568cc36db07abf19550359c0db03a9561c964 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision a65568cc36db07abf19550359c0db03a9561c964)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -126,10 +126,10 @@
 			</div>
 		
 			<div id="usersInGroup">
-				<c:forEach var="user" items="${groupUsers}" varStatus="status">
-					<div id="user-${user.userId}" class="voffset5">
+				<c:forEach var="user" items="${groupUsers}">
+					<div id="user-${user.userId}" class="voffset10 loffset10">
 						<lams:Portrait userId="${user.userId}"/>
-						<span class="portrait-sm-lineheight">
+						<span>
 							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
 						</span>
 					</div>
@@ -184,11 +184,12 @@
 						</div>
 	
 						<div id="usersInGroup" class="voffset10">
-							<c:forEach var="user" items="${groupUsers}" varStatus="status">
-								<div id="user-${user.userId}" class="voffset2">
-									<div class="user loffset10" id="user-${user.userId}">
+							<c:forEach var="user" items="${groupUsers}">
+								<div id="user-${user.userId}" class="voffset10 loffset10">
+									<lams:Portrait userId="${user.userId}"/>
+									<span>
 										<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-									</div>
+									</span>
 								</div>
 							</c:forEach>
 						</div>
Index: lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp
===================================================================
diff -u -rec9b0ffc2e88f3504fd7505ee8474f86d89a2458 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp	(.../changeLeaderDialog.jsp)	(revision ec9b0ffc2e88f3504fd7505ee8474f86d89a2458)
+++ lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp	(.../changeLeaderDialog.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -2,10 +2,19 @@
 
 <script>
 	$(document).ready(function(){
+		<c:if test="${not empty groupLeader}">
+			$('input[name="change-leader-radio-${groupId}"][value="${groupLeader.userId}"]').prop('checked', true);
+		</c:if>
+			 
 		// Change leader button handler 
-		$('#change-leader-modal-${groupId}').modal()
-			.find('.change-leader-button').click(function () {
-				var leaderUserId = $('#change-leader-select-${groupId}').val();
+		var changeLeaderModalGroup${groupId} = $('#change-leader-modal-${groupId}').modal();
+		
+		$('.change-leader-button', changeLeaderModalGroup${groupId}).click(function () {
+				var leaderUserId = $('input[name="change-leader-radio-${groupId}"]:checked').val();
+				if (!leaderUserId || leaderUserId == '${not empty groupLeader ? groupLeader.userId : ""}') {
+					return;
+				}
+				
 		        $.ajax({
 		            url: '<lams:WebAppURL />monitoring/changeLeaderForGroup.do',
 		            data: {
@@ -26,43 +35,47 @@
 
 <div class="modal fade" id="change-leader-modal-${groupId}">
 	<div class="modal-dialog modal-lg">
-	<div class="modal-content">
-	
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-lg fa-close"></i></button>
-			<h4 class="modal-title">
-				<fmt:message key="label.change.leader"/>
-			</h4>
-			<c:if test="${empty toolSessionId}">
-				<small>
-					<fmt:message key="label.note.leader.change"/>
-				</small>
-			</c:if>
-		</div>
-	          
-		<!-- Begin -->
-		<div class="modal-body">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<h4 class="panel-title">${groupName}:</h4> 
+		<div class="modal-content">
+		
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-lg fa-close"></i></button>
+				<h4 class="modal-title">
+					<fmt:message key="label.change.leader"/>
+				</h4>
+				<c:if test="${empty toolSessionId}">
 					<small>
-						<fmt:message key="label.current.leader"/>
-						<c:if test="${not empty groupLeader}">
-							${groupLeader.lastName},&nbsp;${groupLeader.firstName} 
-						</c:if>
+						<fmt:message key="label.note.leader.change"/>
 					</small>
-				</div>
+				</c:if>
+			</div>
+			
+			<div class="modal-body">
+				<h4>${groupName}</h4> 
+				<fmt:message key="label.current.leader"/>&nbsp;
+				<c:choose>
+					<c:when test="${empty groupLeader}">
+						<fmt:message key="label.current.leader.none"/>
+					</c:when>
+					<c:otherwise>
+						<c:out value="${groupLeader.firstName} ${groupLeader.lastName}" escapeXml="true" />
+					</c:otherwise>
+				</c:choose>
 				
-				<div class="panel-body">
-					<select class="select-picker" id="change-leader-select-${groupId}">
-						<c:forEach var="member" items="${members}">
-							<option value="${member.userId}">${member.lastName},&nbsp;${member.firstName}</option>
-						</c:forEach>
-					</select>
+				<div id="usersInGroup">
+					<c:forEach var="user" items="${members}">
+						<div class="voffset10 loffset10">
+							<label>
+								<input type="radio" name="change-leader-radio-${groupId}" value="${user.userId}">
+								<lams:Portrait userId="${user.userId}"/>
+								<span>
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+								</span>
+							</label>
+						</div>
+					</c:forEach>
 				</div>
 			</div>
-			<!-- end -->  
-	              
+			
 			<div class="modal-footer">	
 				<a href="#" data-dismiss="modal" class="btn btn-default">
 					<fmt:message key="button.cancel"/>
@@ -74,5 +87,4 @@
 		</div>
 	          
 	</div>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
===================================================================
diff -u -r4654c7f895cb17f331b95703cedca34e1ab106be -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision 4654c7f895cb17f331b95703cedca34e1ab106be)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -207,6 +207,7 @@
 
 	    // forwards to the leaderSelection page
 	    if (groupLeader == null) {
+		request.setAttribute("groupUsers", submitFilesService.getUsersBySession(toolSessionID));
 		request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader");
 		return "learner/waitforleader";
 	    }
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -r4654c7f895cb17f331b95703cedca34e1ab106be -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 4654c7f895cb17f331b95703cedca34e1ab106be)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -30,6 +30,24 @@
 			<fmt:message key="${waitingMessageKey}" />
 		</h4>
 		
+		<c:if test="${not empty groupUsers}">
+		
+			<div class="voffset5">
+				<fmt:message key="label.users.from.group" />
+			</div>
+		
+			<div id="usersInGroup">
+				<c:forEach var="user" items="${groupUsers}">
+					<div class="voffset10 loffset10">
+						<lams:Portrait userId="${user.userID}"/>
+						<span>
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
+						</span>
+					</div>
+				</c:forEach>
+			</div>
+		</c:if>
+		
 		<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-primary pull-right">
 			<fmt:message key="label.refresh" />
 		</button>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
===================================================================
diff -u -rbe905fe69c81781ca8c63f0772393bab29be0b8e -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision be905fe69c81781ca8c63f0772393bab29be0b8e)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -133,6 +133,7 @@
 	    List<User> groupUserDtos = new ArrayList<>();
 	    for (ScratchieUser groupUser : groupUsers) {
 		User groupUserDto = new User();
+		groupUserDto.setUserId(groupUser.getUserId().intValue());
 		groupUserDto.setFirstName(groupUser.getFirstName());
 		groupUserDto.setLastName(groupUser.getLastName());
 		groupUserDtos.add(groupUserDto);
Index: lams_tool_scratchie/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -30,15 +30,15 @@
 			<fmt:message key="label.users.from.group" />
 		</div>
 
-		<div class="voffset5">
-		
-			<div class="roffset10">
-				<c:forEach var="user" items="${groupUsers}" varStatus="status">
-					<div class="user">
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.userId}"/>
+					<span>
 						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true" />
-					</div>
-				</c:forEach>
+					</span>
 				</div>
+			</c:forEach>
 		</div>
 
 		<c:if test="${mode != teacher}">
Index: lams_tool_vote/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r0b845931db55d90f0dcabc0b33cce5c7df688153 -rea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74
--- lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 0b845931db55d90f0dcabc0b33cce5c7df688153)
+++ lams_tool_vote/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision ea8629a2ce87bf6bf4b91e1b1d47b908a3dd2e74)
@@ -28,10 +28,13 @@
 			<fmt:message key="label.users.from.group" />
 		</div>
 
-		<div>
-			<c:forEach var="user" items="${groupUsers}" varStatus="status">
-				<div class="user">
-					<c:out value="${user.fullname}" escapeXml="true" />
+		<div id="usersInGroup">
+			<c:forEach var="user" items="${groupUsers}">
+				<div class="voffset10 loffset10">
+					<lams:Portrait userId="${user.queUsrId}"/>
+					<span>
+						<c:out value="${user.fullname}" escapeXml="true" />
+					</span>
 				</div>
 			</c:forEach>
 		</div>