Index: lams_central/web/includes/javascript/orgGrouping.js
===================================================================
diff -u -r5a93ffc44f9a5567a1ee8afeb112c9ba25a3bf29 -r40de3afab4e8d589660daffb6efd6e568e87f8fa
--- lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 5a93ffc44f9a5567a1ee8afeb112c9ba25a3bf29)
+++ lams_central/web/includes/javascript/orgGrouping.js	(.../orgGrouping.js)	(revision 40de3afab4e8d589660daffb6efd6e568e87f8fa)
@@ -2,8 +2,21 @@
 
 function removeGrouping(groupingId) {
 	if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) {
-		document.location.href = LAMS_URL + "organisationGroup/removeGrouping.do?organisationID="
-			+ organisationId + "&groupingId=" + groupingId;
+		//dynamically create a form and submit it
+		var form = $('<form method="post" action="' +  LAMS_URL + 'organisationGroup/removeGrouping.do"></form>');
+		
+	    var hiddenField = $('<input type="hidden" name="organisationID" value="' + organisationId + '"></input>');
+	    form.append(hiddenField);
+	    
+	    hiddenField = $('<input type="hidden" name="groupingId" value="' + groupingId + '"></input>');
+	    form.append(hiddenField);
+
+	    hiddenField = $('<input type="hidden" name="' + csrfTokenName + '" value="' + csrfTokenValue + '"></input>');
+	    form.append(hiddenField);
+
+	    // The form needs to be a part of the document in order to be submitted
+	    $(document.body).append(form);
+	    form.submit();
 	}
 }
 
@@ -62,12 +75,16 @@
 			}
 		});
 		
+		var data = {
+			'mapping' : JSON.stringify(groupsToBranches)
+		};
+		data[csrfTokenName] = csrfTokenValue;
+		
 		// save the mapping
 		$.ajax({
 			url : LAMS_URL + 'organisationGroup/saveGroupMappings.do',
-			data : {
-				'mapping' : JSON.stringify(groupsToBranches)
-			},
+			data : data,
+			type : 'POST',
 			success : function(response) {
 				// LAMS can reply 200 even if there is an error, so we need OK response
 				if (response == 'OK') {