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.48.2.14 -r1.48.2.15
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	17 Aug 2015 06:19:55 -0000	1.48.2.14
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	28 Aug 2015 06:07:55 -0000	1.48.2.15
@@ -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.128.2.5 -r1.128.2.6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	22 Aug 2015 00:10:07 -0000	1.128.2.5
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	28 Aug 2015 06:07:58 -0000	1.128.2.6
@@ -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.111.2.13 -r1.111.2.14
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	10 Aug 2015 15:24:10 -0000	1.111.2.13
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	28 Aug 2015 06:07:57 -0000	1.111.2.14
@@ -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.51.2.11 -r1.51.2.12
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	22 Aug 2015 00:29:52 -0000	1.51.2.11
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	28 Aug 2015 06:07:51 -0000	1.51.2.12
@@ -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);