Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r7772ee3d75e659b6a779c34e070ec4253618dd75 -r8235ff2b4eb95000b9a16627df990faf66eeb5ac
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 7772ee3d75e659b6a779c34e070ec4253618dd75)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 8235ff2b4eb95000b9a16627df990faf66eeb5ac)
@@ -1744,6 +1744,10 @@
 		    assessmentDao.removeObject(NotebookEntry.class, entry.getUid());
 		}
 
+		if (session.getGroupLeader() != null && session.getGroupLeader().getUid().equals(user.getUid())) {
+		    session.setGroupLeader(null);
+		}
+
 		// propagade changes to Gradebook
 		gradebookService.updateActivityMark(null, null, userId, session.getSessionId(), false);
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -rf4b320a8ee6f3e55eed019e06e6e728f56ded2d9 -r8235ff2b4eb95000b9a16627df990faf66eeb5ac
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision f4b320a8ee6f3e55eed019e06e6e728f56ded2d9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 8235ff2b4eb95000b9a16627df990faf66eeb5ac)
@@ -1293,6 +1293,10 @@
 			mcContentDAO.delete(entry);
 		    }
 
+		    if (session.getGroupLeader() != null && session.getGroupLeader().getUid().equals(user.getUid())) {
+			session.setGroupLeader(null);
+		    }
+
 		    mcUserDAO.removeMcUser(user);
 
 		    gradebookService.updateActivityMark(null, null, userId, session.getMcSessionId(), false);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r8fd538f0e69320e969865342d94c7c1cbc936977 -r8235ff2b4eb95000b9a16627df990faf66eeb5ac
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 8fd538f0e69320e969865342d94c7c1cbc936977)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 8235ff2b4eb95000b9a16627df990faf66eeb5ac)
@@ -602,6 +602,10 @@
 			qaUsrRespDAO.removeUserResponse(response);
 		    }
 
+		    if (session.getGroupLeader() != null && session.getGroupLeader().getUid().equals(user.getUid())) {
+			session.setGroupLeader(null);
+		    }
+
 		    qaQueUsrDAO.deleteQaQueUsr(user);
 
 		    NotebookEntry entry = getEntry(session.getQaSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r24f4d35ea749ed57dc64aa25d1ab5c37d0c0656f -r8235ff2b4eb95000b9a16627df990faf66eeb5ac
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 24f4d35ea749ed57dc64aa25d1ab5c37d0c0656f)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 8235ff2b4eb95000b9a16627df990faf66eeb5ac)
@@ -1801,6 +1801,10 @@
 		    scratchieDao.removeObject(NotebookEntry.class, entry.getUid());
 		}
 
+		if (session.getGroupLeader() != null && session.getGroupLeader().getUid().equals(user.getUid())) {
+		    session.setGroupLeader(null);
+		}
+
 		scratchieUserDao.removeObject(ScratchieUser.class, user.getUid());
 
 		gradebookService.updateActivityMark(null, null, userId, session.getSessionId(), false);