Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -rebb598b9d631fa479aef19110dc7b8c2cce0575b -r7b00deb3e9e0e67b79ab7d0a1ea247e9fedfbaf9
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision ebb598b9d631fa479aef19110dc7b8c2cce0575b)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 7b00deb3e9e0e67b79ab7d0a1ea247e9fedfbaf9)
@@ -213,7 +213,7 @@
 	    boolean isMonitor = roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR);
 	    boolean disabled = !isMonitor && isKumaliveDisabledForOrganisation;
 	    links.add(new IndexLinkBean(isMonitor ? "index.kumalive.teacher" : "index.kumalive",
-		    "javascript:openKumalive(" + organisationId + ")",
+		    "javascript:openKumalive(" + organisationId + ",'" + (isMonitor ? "teacher" : "learner") + "')",
 		    "fa fa-fw fa-bolt" + (disabled ? " disabled" : ""), "index.kumalive.tooltip"));
 	}
 
@@ -227,10 +227,9 @@
     private IndexOrgBean populateContentsOrgBean(IndexOrgBean orgBean, Organisation org, List<Integer> roles,
 	    String username, boolean isSysAdmin) throws SQLException, NamingException {
 	Integer userId = getUser(username).getUserId();
-	
+
 	// set lesson beans
-	Map<Long, IndexLessonBean> map = populateLessonBeans(userId, org.getOrganisationId(),
-		roles);
+	Map<Long, IndexLessonBean> map = populateLessonBeans(userId, org.getOrganisationId(), roles);
 	List<IndexLessonBean> lessonBeans = IndexUtils.sortLessonBeans(org.getOrderedLessonIds(), map);
 	orgBean.setLessons(lessonBeans);
 
@@ -245,7 +244,8 @@
 
 	    List<IndexOrgBean> childOrgBeans = new ArrayList<>();
 	    for (Organisation childOrganisation : childOrganisations) {
-		if (OrganisationState.ACTIVE.equals(childOrganisation.getOrganisationState().getOrganisationStateId())) {
+		if (OrganisationState.ACTIVE
+			.equals(childOrganisation.getOrganisationState().getOrganisationStateId())) {
 		    List<Integer> classRoles = new ArrayList<>();
 		    List<UserOrganisationRole> userOrganisationRoles = userManagementService
 			    .getUserOrganisationRoles(childOrganisation.getOrganisationId(), username);
@@ -262,7 +262,7 @@
 			classRoles.add(Role.ROLE_GROUP_MANAGER);
 		    }
 		    IndexOrgBean childOrgBean = createOrgBean(childOrganisation, classRoles, username, isSysAdmin);
-		    
+
 		    //check whether organisation was collapsed by the user
 		    if (isCollapsingSubcoursesEnabled) {
 			for (UserOrganisationCollapsed userOrganisationCollapsed : userOrganisationsCollapsed) {
@@ -273,7 +273,7 @@
 			    }
 			}
 		    }
-		    
+
 		    childOrgBeans.add(childOrgBean);
 		}
 	    }
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r7b00deb3e9e0e67b79ab7d0a1ea247e9fedfbaf9
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 7b00deb3e9e0e67b79ab7d0a1ea247e9fedfbaf9)
@@ -23,7 +23,7 @@
 		
 		var	orgId = ${param.organisationID},
 			userId = <lams:user property="userID"/>,
-			role = '${param.role}',
+			role = '${empty param.role ? "none" : param.role}',
 			
 			LAMS_URL = '<lams:LAMSURL/>',
 			LEARNING_URL = LAMS_URL + 'learning/',