Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.61 -r1.62
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	17 Aug 2015 06:08:53 -0000	1.61
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	28 Aug 2015 06:05:35 -0000	1.62
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.133 -r1.134
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	14 Aug 2015 11:28:50 -0000	1.133
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	28 Aug 2015 06:05:33 -0000	1.134
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.127 -r1.128
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	10 Aug 2015 14:07:11 -0000	1.127
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	28 Aug 2015 06:05:27 -0000	1.128
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.63 -r1.64
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	16 Aug 2015 12:22:16 -0000	1.63
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	28 Aug 2015 06:05:31 -0000	1.64
@@ -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);