Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
===================================================================
diff -u -rfec1ddd214ce6af20f01e6cb44002a81b426085f -rd4e021484ff7884e60b88d682d374cc0b7bfae8a
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java	(.../GroupingUploadAJAXAction.java)	(revision fec1ddd214ce6af20f01e6cb44002a81b426085f)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java	(.../GroupingUploadAJAXAction.java)	(revision d4e021484ff7884e60b88d682d374cc0b7bfae8a)
@@ -339,6 +339,14 @@
 		    log.warn("Unable to add learner " + login + " for group in related to grouping "
 			    + orgGroupingId + " as learner cannot be found.");
 		    totalUsersSkipped++;
+		
+		//Check user is a part of the organisation
+		} else if (!getSecurityService().hasOrgRole(organisation.getOrganisationId(), learner.getUserId(),
+			new String[] { Role.GROUP_MANAGER, Role.LEARNER, Role.MONITOR, Role.AUTHOR },
+			"be added to grouping", false)) {
+		    
+		    totalUsersSkipped++;
+
 		} else {
 		    totalUsersAdded++;
 		    learners.add(learner);
@@ -487,6 +495,7 @@
 			skipped++;
 			log.warn("Unable to add learner " + login + " for group in related to grouping " + groupingID
 				+ " as group name is missing.");
+			
 		    } else {
  			Set<String> users = groups.get(groupName);
  			if (users == null) {