Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3f99af7413ffdfdf7f69c54fd2a773f9443ac899)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -460,6 +460,7 @@
 tool.groups.group.name.error  =A group name can not be blank
 tool.groups.save.error  =Error while saving groups
 config.live.edit  =Enable live edit
+config.kumalive.enable  =Enable Kumalive
 sysadmin.extGroupsUrl  =External groups URL
 server.config.title  =Server configuration
 server.monitor.title  =Server monitoring
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r39f1f7974c647ec9524ebb630759a27094027c9c -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 39f1f7974c647ec9524ebb630759a27094027c9c)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -47,6 +47,7 @@
 	<form-property name="enableGradebookForLearners" type="java.lang.Boolean" initial="false"/>
 	<form-property name="enableSingleActivityLessons" type="java.lang.Boolean" initial="false"/>
 	<form-property name="enableLiveEdit" type="java.lang.Boolean" initial="true"/>
+	<form-property name="enableKumalive" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -rbf1610a0d61e3d2c04aeb42006d475409f52e5dc -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision bf1610a0d61e3d2c04aeb42006d475409f52e5dc)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -115,6 +115,13 @@
 				<fmt:message key="config.live.edit"/>
 			</label>
 		</div>
+		
+		<div class="checkbox">
+			<label for="enable-kumalive">
+			<html-el:checkbox property="enableKumalive" styleId="enable-kumalive"/>
+				<fmt:message key="config.kumalive.enable"/>
+			</label>
+		</div>
 	
 	<logic:notEmpty name="OrganisationForm" property="orgId">
 		<div class="voffset10">
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -ree2713a23c1a795eec5f782795da09918cbdf006
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 3f99af7413ffdfdf7f69c54fd2a773f9443ac899)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -213,8 +213,9 @@
 	    }
 	}
 
-	if (Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE) && (roles.contains(Role.ROLE_GROUP_MANAGER)
-		|| roles.contains(Role.ROLE_MONITOR) || roles.contains(Role.ROLE_LEARNER))) {
+	if (Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE) && org.getEnableKumalive()
+		&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)
+			|| roles.contains(Role.ROLE_LEARNER))) {
 	    links.add(new IndexLinkBean(
 		    roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)
 			    ? "index.kumalive.teacher"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r8e2527dec3a9ab0f4452577d049ae63d5e5647ae -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 8e2527dec3a9ab0f4452577d049ae63d5e5647ae)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -125,6 +125,10 @@
 				length="1" not-null="true"
 			</meta>
 		</property>
+		
+		<property name="enableKumalive" type="java.lang.Boolean"
+				  column="enable_kumalive" not-null="true" length="1">
+		</property>
 
 		<!-- Associations -->
 
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171023.sql
===================================================================
diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171023.sql	(.../patch20171023.sql)	(revision 3f99af7413ffdfdf7f69c54fd2a773f9443ac899)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171023.sql	(.../patch20171023.sql)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -3,10 +3,12 @@
 SET FOREIGN_KEY_CHECKS=0;
 ----------------------Put all sql statements below here-------------------------
 
--- LDEV-4447 Add "Allow Kumalive" to system settings
+-- LDEV-4447 Add "Allow Kumalive" to system settings and organisation
 INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required)
 VALUES ('AllowKumalive','true', 'config.allow.kumalive', 'config.header.features', 'BOOLEAN', 1);
 
+ALTER TABLE lams_organisation ADD COLUMN enable_kumalive TINYINT(1) NOT NULL DEFAULT 0 AFTER enable_live_edit;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -r8e2527dec3a9ab0f4452577d049ae63d5e5647ae -ree2713a23c1a795eec5f782795da09918cbdf006
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 8e2527dec3a9ab0f4452577d049ae63d5e5647ae)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision ee2713a23c1a795eec5f782795da09918cbdf006)
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 
 public class Organisation implements Serializable, Comparable {
-
     private static final long serialVersionUID = -6742443056151585129L;
 
     /** identifier field */
@@ -101,6 +100,9 @@
     private Boolean enableLiveEdit;
 
     /** persistent field */
+    private Boolean enableKumalive;
+
+    /** persistent field */
     private Date archivedDate;
 
     private String orderedLessonIds;
@@ -358,4 +360,12 @@
     public void setEnableLiveEdit(Boolean enableLiveEdit) {
 	this.enableLiveEdit = enableLiveEdit;
     }
+
+    public Boolean getEnableKumalive() {
+	return enableKumalive;
+    }
+
+    public void setEnableKumalive(Boolean enableKumalive) {
+	this.enableKumalive = enableKumalive;
+    }
 }
\ No newline at end of file