Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java,v
diff -u -r1.9.2.15 -r1.9.2.16
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	13 Jan 2017 06:56:25 -0000	1.9.2.15
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	15 May 2017 18:10:50 -0000	1.9.2.16
@@ -417,23 +417,10 @@
 	    orgGrouping = new OrganisationGrouping();
 	    orgGrouping.setOrganisationId(organisationId);
 	}
-
-	// check if there is no grouping with the same name
+	// update grouping name
 	String orgGroupingName = orgGroupingJSON.getString("name");
-	if (!orgGroupingName.equals(orgGrouping.getName())) {
-	    Map<String, Object> duplicateCheckProperties = new TreeMap<String, Object>();
-	    duplicateCheckProperties.put("organisationId", organisationId);
-	    duplicateCheckProperties.put("name", orgGroupingName);
+	orgGrouping.setName(orgGroupingName);
 
-	    List<OrganisationGrouping> duplicateOrgGrouping = getUserManagementService()
-		    .findByProperties(OrganisationGrouping.class, duplicateCheckProperties);
-	    if (duplicateOrgGrouping.isEmpty()) {
-		orgGrouping.setName(orgGroupingName);
-	    } else {
-		throw new InvalidParameterException("Grouping with name \"" + orgGroupingName + "\" already exists");
-	    }
-	}
-
 	getUserManagementService().saveOrganisationGrouping(orgGrouping, orgGroups);
 	return null;
     }
Index: lams_central/web/orgGroup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/orgGroup.jsp,v
diff -u -r1.4.2.11 -r1.4.2.12
--- lams_central/web/orgGroup.jsp	12 May 2017 17:26:44 -0000	1.4.2.11
+++ lams_central/web/orgGroup.jsp	15 May 2017 18:10:50 -0000	1.4.2.12
@@ -69,17 +69,24 @@
 </c:if>
 
 <c:if test="${not lessonMode and (empty usedForBranching or usedForBranching eq false)}">
+
+	<!-- It is shown when user tries to save a grouping with empty name -->
+	<span id="grouping-name-blank-error" class="errorMessage">
+		<fmt:message key="label.course.groups.name.blank" />
+	</span>
+
+	<!-- It is shown when user tries to save a grouping with a non unique name -->
+	<span id="grouping-name-non-unique-error" class="errorMessage">
+		<fmt:message key="label.course.groups.name.not.unique" />
+	</span>
+		
 	<div id="titleDiv">
 		<fmt:message key="label.course.groups.name" />
 		<input id="groupingName" type="text"
 			<c:if test="${not canEdit or lessonMode}">
 				readonly="readonly"
 			</c:if>
 		/>
-		<!-- It is showed when user tries to save a grouping with empty name -->
-		<span id="groupingNameBlankError" class="errorMessage">
-			<fmt:message key="label.course.groups.name.blank" />
-		</span>
 		
 		<c:if test="${canEdit}">
 			<button class="pull-right btn btn-default" onClick="javascript:saveGroups()">
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/orgGroup.js,v
diff -u -r1.6.2.6 -r1.6.2.7
--- lams_central/web/includes/javascript/orgGroup.js	12 May 2017 14:28:11 -0000	1.6.2.6
+++ lams_central/web/includes/javascript/orgGroup.js	15 May 2017 18:10:50 -0000	1.6.2.7
@@ -22,6 +22,16 @@
 	// initialisation based on mode
 	if (!lessonMode) {
 		$('#groupingName').val(grouping.name);
+		
+		// ability to save a grouping on pressing the Enter key in the name input field
+		$('#groupingName').on('keyup', function (e) {
+			//remove alert class if it was applied
+			$("#grouping-name-blank-error,#grouping-name-non-unique-error").hide();
+			
+		    if (e.keyCode == 13) {
+				saveGroups();
+		    }
+		});
 	}
 	
 	if (canEdit) {
@@ -371,12 +381,35 @@
 	$('.errorMessage').hide();
 	
 	var groupingName = $('#groupingName').val();
+	// course grouping name can not be blank
 	if (!groupingName) {
-		// course grouping name can not be blank
-		$('#groupingNameBlankError').show();
+		$('#grouping-name-blank-error').show();
+		$('#groupingName').focus();
 		return false;
 	}
 	
+	// course grouping name should be unique
+	var isGroupingNameUnique = false;
+	$.ajax({
+		dataType : 'json',
+		url : LAMS_URL + 'monitoring/grouping.do',
+		cache : false,
+		async : false,
+		data : {
+			'method'    : 'checkGroupingNameUnique',
+			'organisationID' : grouping.organisationId,
+			'name'  : groupingName
+		},		
+		success : function(response) {
+			isGroupingNameUnique = response.isGroupingNameUnique;
+		}
+	});
+	if ((grouping.name != groupingName) && !isGroupingNameUnique) {
+		$('#grouping-name-non-unique-error').show();
+		$('#groupingName').focus();
+		return false;		
+	}
+	
 	// ask if removing new, empty groups is OK
 	var acceptEmptyGroups = true;
 	var groupContainers = $('#groupsTable .groupContainer').not('#newGroupPlaceholder');