Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rc307a78aca6f80434a5ee07496e70cb3f418d6cd -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision c307a78aca6f80434a5ee07496e70cb3f418d6cd)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -217,9 +217,14 @@
 	if (leader == null) {
 
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
 	    if (user.getUserId().equals(leaderUserId)) {
+		// is it me?
 		leader = user;
+	    } else {
+		leader = getUserByIDAndSession(leaderUserId, toolSessionId);
+	    }
+	    if (leader != null) {
 		// set group leader
 		assessmentSession.setGroupLeader(leader);
 		assessmentSessionDao.saveObject(assessmentSession);
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r0ebaba46f0ce87b5138e8e70cc1965887c1c7787 -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 0ebaba46f0ce87b5138e8e70cc1965887c1c7787)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -213,10 +213,14 @@
 	    // screw up previous scratches done
 	    if (leader == null) {
 		Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue());
-		// set leader only if current user is the leader
+		// set leader only if the leader entered the activity
 		if (user.getUserId().equals(leaderUserId)) {
+		    // is it me?
 		    leader = user;
-
+		} else {
+		    leader = getUserByIDAndSession(leaderUserId, toolSessionId);
+		}
+		if (leader != null) {
 		    // set group leader
 		    session.setGroupLeader(leader);
 		    dokumaranSessionDao.saveObject(session);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0 -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -168,10 +168,14 @@
 	if (leader == null) {
 
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
 	    if (user.getQueUsrId().equals(leaderUserId)) {
+		// is it me?
 		leader = user;
-
+	    } else {
+		leader = getMcUserBySession(leaderUserId, mcSession.getUid());
+	    }
+	    if (leader != null) {
 		// set group leader
 		mcSession.setGroupLeader(leader);
 		mcSessionDAO.updateMcSession(mcSession);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -r3eb8dcbf308a6b082c30d57f51e7000ebbe1c184 -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 3eb8dcbf308a6b082c30d57f51e7000ebbe1c184)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -146,10 +146,14 @@
 	if (leader == null) {
 
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
 	    if (user.getQueUsrId().equals(leaderUserId)) {
+		// is it me?
 		leader = user;
-
+	    } else {
+		leader = getUserByIdAndSession(leaderUserId, toolSessionId);
+	    }
+	    if (leader != null) {
 		// set group leader
 		qaSession.setGroupLeader(leader);
 		this.updateSession(qaSession);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r2e476d9e28e7598c2caf7c366dca0b995a9d50f3 -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 2e476d9e28e7598c2caf7c366dca0b995a9d50f3)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -1374,10 +1374,17 @@
 	// up previous scratches done
 	if (leader == null) {
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserID().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
+	    if (leaderUserId == null) {
+		return null;
+	    }
 	    if (user.getUserID().equals(leaderUserId.intValue())) {
+		// is it me?
 		leader = user;
-
+	    } else {
+		leader = getSessionUser(toolSessionId, leaderUserId.intValue());
+	    }
+	    if (leader != null) {
 		// set group leader
 		submitFileSession.setGroupLeader(leader);
 		submitFilesSessionDAO.insertOrUpdate(submitFileSession);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r4fa7e1b76a14f19ba10520c8c7d5b5d5a8c7388b -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 4fa7e1b76a14f19ba10520c8c7d5b5d5a8c7388b)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -341,10 +341,14 @@
 	// up previous scratches done
 	if (leader == null) {
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
 	    if (user.getUserId().equals(leaderUserId)) {
+		// is it me?
 		leader = user;
-
+	    } else {
+		leader = getUserByIDAndSession(leaderUserId, toolSessionId);
+	    }
+	    if (leader != null) {
 		// set group leader
 		scratchieSession.setGroupLeader(leader);
 		saveOrUpdateScratchieSession(scratchieSession);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
===================================================================
diff -u -r3eb8dcbf308a6b082c30d57f51e7000ebbe1c184 -re62e56b0f0d04f6820592e95b0271619784a2c9f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision 3eb8dcbf308a6b082c30d57f51e7000ebbe1c184)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision e62e56b0f0d04f6820592e95b0271619784a2c9f)
@@ -158,10 +158,14 @@
 	// up previous scratches done
 	if (leader == null) {
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getQueUsrId().intValue());
-	    // set leader only if current user is the leader
+	    // set leader only if the leader entered the activity
 	    if (user.getQueUsrId().equals(leaderUserId)) {
+		// is it me?
 		leader = user;
-
+	    } else {
+		leader = getVoteUserBySession(leaderUserId, session.getUid());
+	    }
+	    if (leader != null) {
 		// set group leader
 		session.setGroupLeader(leader);
 		voteSessionDAO.updateVoteSession(session);