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.12 -r1.9.2.13
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	8 Jan 2017 14:18:40 -0000	1.9.2.12
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	10 Jan 2017 10:17:24 -0000	1.9.2.13
@@ -101,14 +101,8 @@
     public ActionForward viewGroupings(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID, true);
-	Grouping lessonGrouping = getLessonGrouping(request, activityID, false);
-
-	// if this grouping is used for branching then it should use groups set in authoring. It will be possible to
-	// remove users from the groups, but not delete groups due to the branching relationships
-	boolean isUsedForBranching = lessonGrouping != null && lessonGrouping.isUsedForBranching();
-	request.setAttribute(GroupingAJAXAction.PARAM_USED_FOR_BRANCHING, isUsedForBranching);
 	
-	boolean lessonGroupsExist = lessonGrouping != null;
+	boolean lessonGroupsExist = getLessonGrouping(request, activityID, false) != null;
 	if (lessonGroupsExist) {
 	    // this is lesson mode and user have already chosen a grouping before, so show it
 	    return viewGroups(mapping, form, request, response);
@@ -147,7 +141,7 @@
 	request.setAttribute(AttributeNames.PARAM_ORGANISATION_ID, organisationId);
 
 	// if it's not a group-based branching and lesson is created using integrations - show groups received from LMS instead of actual LAMS ones
-	if (!isUsedForBranching && getIntegrationService().isIntegratedServerGroupFetchingAvailable(lessonId)) {
+	if (getIntegrationService().isIntegratedServerGroupFetchingAvailable(lessonId)) {
 
 	    if (lessonId == null) {
 		//it's when a learner clicks back button on groups page
@@ -252,11 +246,6 @@
 
 	    lessonGroups = null;
 	}
-	
-	// if this grouping is used for branching then it should use groups set in authoring. It will be possible to
-	// remove users from the groups, but not delete groups due to the branching relationships
-	boolean isUsedForBranching = lessonGrouping.isUsedForBranching();
-	request.setAttribute(GroupingAJAXAction.PARAM_USED_FOR_BRANCHING, isUsedForBranching);
 
 	JSONArray orgGroupsJSON = new JSONArray();
 	Collection<User> learners = null;
@@ -612,8 +601,15 @@
 			    .getCreateGrouping();
 
 	    if ((grouping != null) && (grouping.getGroups() != null)) {
+		
+		// if this grouping is used for branching then it should use groups set in authoring. It will be possible to
+		// remove users from the groups, but not delete groups due to the branching relationships.
+		// (Not very obvious place to use it, but it made most sense.)
+		boolean isUsedForBranching = grouping.isUsedForBranching();
+		request.setAttribute(GroupingAJAXAction.PARAM_USED_FOR_BRANCHING, isUsedForBranching);
+		
 		Set<Group> groups = grouping.getGroups();
-		return !groups.isEmpty() && (allowDefault || !isDefaultChosenGrouping(grouping)) ? grouping : null;
+		return !groups.isEmpty() && (allowDefault || isUsedForBranching || !isDefaultChosenGrouping(grouping)) ? grouping : null;
 	    }
 	}