Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r754954375d5d881d3be9828129b7052963c71a4f
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 754954375d5d881d3be9828129b7052963c71a4f)
@@ -1,17 +1,16 @@
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.query.Query;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.usermanagement.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 /**
  * Hibernate implementation of IUserDAO
  */
@@ -22,7 +21,7 @@
 	    String searchPhrase) {
 	return getAllUsersPage(
 		"SELECT user.userId, user.login, user.firstName, user.lastName, user.email, user.portraitUuid "
-			+ "FROM User user WHERE user.disabledFlag=0 ",
+			+ "FROM User user WHERE user.disabledFlag=false ",
 		"user", page, size, sortBy, sortOrder, searchPhrase);
     }
 
@@ -103,7 +102,7 @@
 
     @Override
     public int getCountUsers(String searchPhrase) {
-	StringBuilder queryBuilder = new StringBuilder("SELECT count(*) FROM User user WHERE user.disabledFlag=0 ");
+	StringBuilder queryBuilder = new StringBuilder("SELECT count(*) FROM User user WHERE user.disabledFlag=false ");
 	// support for custom search from a toolbar
 	UserDAO.addNameSearch(queryBuilder, "user", searchPhrase);
 
@@ -116,7 +115,7 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<User> findUsers(String searchPhrase) {
-	StringBuilder queryBuilder = new StringBuilder("SELECT u FROM User u WHERE u.disabledFlag=0 ");
+	StringBuilder queryBuilder = new StringBuilder("SELECT u FROM User u WHERE u.disabledFlag=false ");
 	UserDAO.addNameSearch(queryBuilder, "u", searchPhrase);
 	queryBuilder.append(" ORDER BY u.login");
 
@@ -127,7 +126,7 @@
     @Override
     public List<User> findUsers(String searchPhrase, Integer filteredOrgId) {
 	StringBuilder queryBuilder = new StringBuilder(
-		"SELECT u FROM User u WHERE u.disabledFlag=0 AND u.userId NOT IN (SELECT uo.user.userId FROM UserOrganisation uo WHERE "
+		"SELECT u FROM User u WHERE u.disabledFlag=false AND u.userId NOT IN (SELECT uo.user.userId FROM UserOrganisation uo WHERE "
 			+ "uo.organisation.organisationId=").append(filteredOrgId).append(")");
 	UserDAO.addNameSearch(queryBuilder, "u", searchPhrase);
 	queryBuilder.append(" ORDER BY u.login");
@@ -139,7 +138,7 @@
     @Override
     public List<User> findUsers(String searchPhrase, Integer orgId, Integer filteredOrgId) {
 	StringBuilder queryBuilder = new StringBuilder(
-		"SELECT uo.user FROM UserOrganisation uo WHERE uo.user.disabledFlag=0 AND uo.organisation.organisationId=")
+		"SELECT uo.user FROM UserOrganisation uo WHERE uo.user.disabledFlag=false AND uo.organisation.organisationId=")
 			.append(orgId)
 			.append(" AND uo.user.userId NOT IN (SELECT uo.user.userId FROM UserOrganisation uo WHERE uo.organisation.organisationId=")
 			.append(filteredOrgId).append(")");
@@ -153,7 +152,7 @@
     @Override
     public List<User> findUsers(String searchPhrase, Integer orgId, boolean includeChildOrgs) {
 	StringBuilder queryBuilder = new StringBuilder(
-		"SELECT u FROM User u WHERE u.disabledFlag=0 AND u.userId IN (SELECT uo.user.userId FROM UserOrganisation uo"
+		"SELECT u FROM User u WHERE u.disabledFlag=false AND u.userId IN (SELECT uo.user.userId FROM UserOrganisation uo"
 			+ " WHERE uo.organisation.organisationId=").append(orgId);
 
 	if (includeChildOrgs) {
@@ -169,14 +168,14 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<User> getAllUsers() {
-	return find("FROM User u WHERE u.disabledFlag=0 ORDER BY u.login");
+	return find("FROM User u WHERE u.disabledFlag=false ORDER BY u.login");
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public List<User> findUsers(Integer filteredOrgId) {
 	return find(
-		"FROM User u WHERE u.disabledFlag=0 AND u.userId NOT IN (SELECT uo.user.userId FROM UserOrganisation uo WHERE uo.organisation.organisationId="
+		"FROM User u WHERE u.disabledFlag=false AND u.userId NOT IN (SELECT uo.user.userId FROM UserOrganisation uo WHERE uo.organisation.organisationId="
 			+ filteredOrgId + ") ORDER BY u.login");
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
===================================================================
diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r754954375d5d881d3be9828129b7052963c71a4f
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java	(.../KumaliveDAO.java)	(revision 2188972474f8d186d6811e3dea2e4136be669335)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java	(.../KumaliveDAO.java)	(revision 754954375d5d881d3be9828129b7052963c71a4f)
@@ -23,8 +23,6 @@
 
 package org.lamsfoundation.lams.learning.kumalive.dao.hibernate;
 
-import java.util.List;
-
 import org.hibernate.query.Query;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.learning.kumalive.dao.IKumaliveDAO;
@@ -34,10 +32,12 @@
 import org.lamsfoundation.lams.learning.kumalive.model.KumaliveScore;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public class KumaliveDAO extends LAMSBaseDAO implements IKumaliveDAO {
     private static final String FIND_CURRENT_KUMALIVE_BY_ORGANISATION = "FROM " + Kumalive.class.getName()
-	    + " AS k WHERE k.organisation.organisationId = ? AND k.finished = 0";
+	    + " AS k WHERE k.organisation.organisationId = ? AND k.finished = false";
     private static final String FIND_KUMALIVES_BY_ORGANISATION = "FROM " + Kumalive.class.getName()
 	    + " AS k WHERE k.organisation.organisationId = ? ORDER BY ";
     private static final String FIND_KUMALIVES_BY_IDS = "FROM " + Kumalive.class.getName()