Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6be225f8d21a7f927da78ca099fc8c3915d7668a -r7e26cc267b556ce7f7b2116b13a9afe02f353d74
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6be225f8d21a7f927da78ca099fc8c3915d7668a)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
@@ -285,7 +285,7 @@
 label.tab.lesson = Lesson
 label.tab.class = Class
 label.tab.advanced = Advanced
-label.tab.grouping = Grouping
+label.tab.grouping = Groups
 label.tab.conditions = Conditions
 label.tab.lesson.title = Select the design to add a lesson, and click on Add now
 label.tab.class.title = Use drag n' drop to select or unselect monitors and learners
@@ -314,8 +314,8 @@
 label.tab.advanced.field.split.number = No. learners per lesson
 label.tab.advanced.field.scheduling = Enable scheduling
 label.tab.advanced.split.desc = [0] instances of this lesson will be created and approximately [1] will be allocated to each lesson
-label.tab.grouping.desc.1 = Choose a course grouping to apply to grouping activities in the chosen Learning Design, if any.
-label.tab.grouping.desc.2 = If there is a branching based on the given grouping activity, the course grouping will not be applied.
+label.tab.grouping.desc = You can select one of the preset course groupings below to apply it directly to all grouping activities in the chosen design.
+label.tab.grouping.none = The selected design does not contain an activity to apply course grouping to.
 label.tab.conditions.dependencies = Dependencies
 label.tab.conditions.dependencies.desc = Select a lesson that learners will need to complete before they can see the lesson you are about to create.
 label.tab.conditions.timelimit = Time limitations
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r1233d7630219a578085d60792930fba266fe15d4 -r7e26cc267b556ce7f7b2116b13a9afe02f353d74
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 1233d7630219a578085d60792930fba266fe15d4)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
@@ -23,6 +23,7 @@
 	<script type="text/javascript">
 		var userId = '<lams:user property="userID"/>',
 			users = ${users},
+			orgGroupingsAvailable = ${not empty orgGroupings},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
@@ -65,10 +66,10 @@
 		<lams:Tabs>
 			<lams:Tab id="1" key="label.tab.lesson" />
 			<lams:Tab id="2" key="label.tab.class" />
-			<lams:Tab id="3" key="label.tab.advanced" />
 			<c:if test="${not empty orgGroupings}">
-				<lams:Tab id="4" key="label.tab.grouping" />
+				<lams:Tab id="3" key="label.tab.grouping" />
 			</c:if>
+			<lams:Tab id="4" key="label.tab.advanced" />
 			<lams:Tab id="5" key="label.tab.conditions" />
 		</lams:Tabs>
 		<lams:TabBodyArea>
@@ -161,7 +162,46 @@
 					</table>
 				</lams:TabBody>
 				
-				<lams:TabBody id="3">
+				<c:if test="${not empty orgGroupings}">
+					<lams:TabBody id="3">
+						<!-- Course groupings panel -->
+						<div class="row voffset10">
+							<div class="col-sm-8 col-sm-offset-2" id="grouping-tab-desc">
+								<p id="grouping-tab-desc-select"><fmt:message key="label.tab.grouping.desc" /></p>
+								<div class="alert alert-info text-center" role="alert" id="grouping-tab-desc-none">
+									<fmt:message key="label.tab.grouping.none" />
+								</div>
+							</div>
+						</div>
+						
+						<div class="row loffset20" id="grouping-tab-select">
+							<div class="col-sm-8 col-sm-offset-2">
+								<div class="checkbox">
+									<label>
+										<input name="orgGroupingId" type="radio" value="" checked/>
+										<fmt:message key="authoring.label.none" />
+									</label>
+								</div>
+								<c:forEach var="orgGrouping" items="${orgGroupings}">
+									<div class="checkbox">
+										<label>
+											<input name="orgGroupingId" type="radio" value="${orgGrouping.groupingId}"/>
+											<c:out value="${orgGrouping.name}" />
+											<span title='<fmt:message key="label.course.groups.grouping.count.tooltip" />'>
+												(${orgGrouping.groupCount})
+											</span>
+										</label>
+										<i class="fa fa-external-link show-grouping-link"
+										   title='<fmt:message key="label.course.groups.viewonly.title" />' 
+										   onClick="javascript:showOrgGrouping(${orgGrouping.groupingId})"></i>
+										
+									</div>
+								</c:forEach>
+							</div>
+						</div>
+					</lams:TabBody>
+				</c:if>
+				<lams:TabBody id="4">
 					<!-- Advanced Panel -->
 					<input id="organisation-id" name="organisationID" value="${param.organisationID}" type="hidden" />
 					<input id="ldIdField" name="learningDesignID" type="hidden" />
@@ -295,35 +335,6 @@
 					</c:if>
 				</lams:TabBody>
 				
-				<lams:TabBody id="4">
-					
-						<p class="voffset10"><fmt:message key="label.tab.grouping.desc.1" /></p>
-						<p><fmt:message key="label.tab.grouping.desc.2" /></p>
-						<div class="loffset20">
-						<div class="checkbox">
-							<label>
-								<input name="orgGroupingId" type="radio" value="" checked/>
-								<fmt:message key="authoring.label.none" />
-							</label>
-						</div>
-						<c:forEach var="orgGrouping" items="${orgGroupings}">
-							<div class="checkbox">
-								<label>
-									<input name="orgGroupingId" type="radio" value="${orgGrouping.groupingId}"/>
-									<c:out value="${orgGrouping.name}" />
-									<span title='<fmt:message key="label.course.groups.grouping.count.tooltip" />'>
-										(${orgGrouping.groupCount})
-									</span>
-								</label>
-								<i class="fa fa-external-link show-grouping-link"
-								   title='<fmt:message key="label.course.groups.viewonly.title" />' 
-								   onClick="javascript:showOrgGrouping(${orgGrouping.groupingId})"></i>
-								
-							</div>
-						</c:forEach>
-					</div>
-				</lams:TabBody>
-				
 				<lams:TabBody id="5">
 					<!-- Conditions Panel -->
 					<div class="lead"><fmt:message key="label.tab.conditions.dependencies" /></div>
Index: lams_central/web/css/addLesson.scss
===================================================================
diff -u -r1233d7630219a578085d60792930fba266fe15d4 -r7e26cc267b556ce7f7b2116b13a9afe02f353d74
--- lams_central/web/css/addLesson.scss	(.../addLesson.scss)	(revision 1233d7630219a578085d60792930fba266fe15d4)
+++ lams_central/web/css/addLesson.scss	(.../addLesson.scss)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
@@ -237,5 +237,9 @@
 }
 
 .show-grouping-link {
-	cursor: pointer;
+  cursor: pointer;
+}
+
+#grouping-tab-select, #grouping-tab-desc-select {
+  display: none;
 }
\ No newline at end of file
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r1233d7630219a578085d60792930fba266fe15d4 -r7e26cc267b556ce7f7b2116b13a9afe02f353d74
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 1233d7630219a578085d60792930fba266fe15d4)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
@@ -31,6 +31,11 @@
 			// hide existing LD image
 			$('.ldChoiceDependentCanvasElement').css('display', 'none');
 			
+			if (orgGroupingsAvailable) {
+				$('#grouping-tab-desc-select, #grouping-tab-select').hide();
+				$('#grouping-tab-desc-none').show();
+			}
+			
 			// if a LD is selected
 			if (node.state.selected && node.learningDesignId) {
 				$('#lessonNameInput').val(node.label);
@@ -40,6 +45,21 @@
 				}
 				// display "loading" animation and finally LD thumbnail
 				loadLearningDesignSVG(node.learningDesignId);
+				
+				if (orgGroupingsAvailable) {
+					$.ajax({
+						'url' : LAMS_URL + 'monitoring/monitoring/isLearningDesignHasGroupings.do',
+						'data' : {
+							'learningDesignId' : node.learningDesignId
+						},
+						'dataType' : 'text',
+						'success' : function(response) {
+							let hasGroupings = response == 'true';
+							$('#grouping-tab-desc-select, #grouping-tab-select').toggle(hasGroupings);
+							$('#grouping-tab-desc-none').toggle(!hasGroupings);
+						}
+					})
+				}
 			} else {
 				// a folder got selected or LD got deselected
 				$('#lessonNameInput').val(null);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
===================================================================
diff -u -r6be225f8d21a7f927da78ca099fc8c3915d7668a -r7e26cc267b556ce7f7b2116b13a9afe02f353d74
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision 6be225f8d21a7f927da78ca099fc8c3915d7668a)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
@@ -59,6 +59,7 @@
 import org.lamsfoundation.lams.learningdesign.ContributionTypes;
 import org.lamsfoundation.lams.learningdesign.GateActivity;
 import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity;
 import org.lamsfoundation.lams.learningdesign.SequenceActivity;
@@ -1544,6 +1545,19 @@
 	return "timer";
     }
 
+    @RequestMapping(path = "/isLearningDesignHasGroupings", method = RequestMethod.GET)
+    @ResponseBody
+    public String isLearningDesignHasGroupings(@RequestParam long learningDesignId) {
+	LearningDesign learningDesign = learningDesignService.getLearningDesign(learningDesignId);
+	for (Activity activity : learningDesign.getActivities()) {
+	    if (activity.isGroupingActivity()
+		    && !((GroupingActivity) activity).getCreateGrouping().isUsedForBranching()) {
+		return Boolean.TRUE.toString();
+	    }
+	}
+	return Boolean.FALSE.toString();
+    }
+
     /**
      * Creates a list of users out of string with comma-delimited user IDs.
      */