Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
===================================================================
diff -u -rc52aeb0714241a71f1842e1e39b1363ef274e1a7 -rf9cf11a96c59e6752e4bdc214a82febf29dfe457
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision c52aeb0714241a71f1842e1e39b1363ef274e1a7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision f9cf11a96c59e6752e4bdc214a82febf29dfe457)
@@ -312,6 +312,7 @@
      * 
      * @throws InvalidParameterException
      */
+    @SuppressWarnings("unchecked")
     public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws JSONException, InvalidParameterException {
 	// check if user is allowed to edit groups
@@ -384,9 +385,9 @@
 	    duplicateCheckProperties.put("organisationId", organisationId);
 	    duplicateCheckProperties.put("name", orgGroupingName);
 
-	    OrganisationGrouping duplicateOrgGrouping = (OrganisationGrouping) getUserManagementService()
+	    List<OrganisationGrouping> duplicateOrgGrouping = getUserManagementService()
 		    .findByProperties(OrganisationGrouping.class, duplicateCheckProperties);
-	    if (duplicateOrgGrouping == null) {
+	    if (duplicateOrgGrouping.isEmpty()) {
 		orgGrouping.setName(orgGroupingName);
 	    } else {
 		throw new InvalidParameterException("Grouping with name \"" + orgGroupingName + "\" already exists");
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -r0b087f6386e7e8cfd72dd34e3eec37533cb97d5f -rf9cf11a96c59e6752e4bdc214a82febf29dfe457
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 0b087f6386e7e8cfd72dd34e3eec37533cb97d5f)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision f9cf11a96c59e6752e4bdc214a82febf29dfe457)
@@ -188,7 +188,7 @@
 	if (canEdit) {
 		$(container).droppable({
 		   'activeClass' : 'droppableHighlight',
-		   'tolerance'   : 'touch',
+		   'tolerance'   : 'pointer',
 		   'drop'        : function (event, ui) {
 			   var draggableUserContainer = $(ui.draggable).parent();
 			   var thisUserContainer = $('.userContainer', this);