Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 -r4e5f3ed481806c14a1001bce3e5617bdf5cec8cc
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 -r4e5f3ed481806c14a1001bce3e5617bdf5cec8cc
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
===================================================================
diff -u -r0267a9238f122504943b400c11ca0fa751698aba -r4e5f3ed481806c14a1001bce3e5617bdf5cec8cc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 4e5f3ed481806c14a1001bce3e5617bdf5cec8cc)
@@ -79,7 +79,7 @@
 			_groupingTypeID= dto.groupingTypeID;
 			_numberOfGroups = dto.numberOfGroups;
 			_maxNumberOfGroups = dto.maxNumberOfGroups;
-			_learnersPerGroups = dto.learnersPerGroups;
+			_learnersPerGroups = dto.learnersPerGroup;
 			
 			populateGroups(dto.groups);
 	}
@@ -119,10 +119,11 @@
 		if(_groupingID){		dto.groupingID = _groupingID;				}
 		if(_groupingUIID){		dto.groupingUIID = _groupingUIID;			}
 		if(_groupingTypeID){	dto.groupingTypeID = _groupingTypeID;		}
-		if(_numberOfGroups){	dto.numberOfGroups = _numberOfGroups;		}
-		if(_maxNumberOfGroups){	dto.maxNumberOfGroups = _maxNumberOfGroups;	}
-		if(_learnersPerGroups){	dto.learnersPerGroups = _learnersPerGroups;	}
 		
+		dto.numberOfGroups = (_numberOfGroups > 0) ? _numberOfGroups : Config.NUMERIC_NULL_VALUE;
+		dto.maxNumberOfGroups = (_maxNumberOfGroups > 0) ? _maxNumberOfGroups : Config.NUMERIC_NULL_VALUE;
+		dto.learnersPerGroup = (_learnersPerGroups > 0) ? _learnersPerGroups :  Config.NUMERIC_NULL_VALUE; 
+		
 		dto.groups = new Array();
 		
 		var groupTotal = (groupingTypeID == RANDOM_GROUPING) ? numberOfGroups : maxNumberOfGroups;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -rbd2250d190598e8e706bdd0907bcc5ebdf397c98 -r4e5f3ed481806c14a1001bce3e5617bdf5cec8cc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision bd2250d190598e8e706bdd0907bcc5ebdf397c98)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 4e5f3ed481806c14a1001bce3e5617bdf5cec8cc)
@@ -479,7 +479,8 @@
 				
 				_group_naming_btn.enabled = e;
 			}
-			
+			
+			checkGroupRadioOptions(e);
 			checkEnableGroupsOptions(e);
 			
 		}else{
@@ -542,14 +543,16 @@
 			g.numberOfGroups = 0;
 			
 			numRandomGroups_stp.enabled = false;
-			numLearners_stp.enabled = e&&true;
+			numLearners_stp.enabled = e&&true;
+			
 			_group_naming_btn.enabled = false;
 		}else{
 			numRandomGroups_stp.enabled = e&&true;
 			numLearners_stp.value = 0;
 			g.learnersPerGroups = 0;
 			
-			numLearners_stp.enabled = false;
+			numLearners_stp.enabled = false;
+			
 			_group_naming_btn.enabled = (e != null && numRandomGroups_stp.value > 0) ? e&&true : false;
 		}
 		
@@ -558,35 +561,37 @@
 		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppersLater));
 		
 	}
+	
+	private function checkGroupRadioOptions(e:Boolean) {
+		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
+		
+		if(g.numberOfGroups > 0 && g.learnersPerGroups <= 0) { numGroups_rdo.selected = true; _group_naming_btn.enabled = e&&true; }
+		else if(g.learnersPerGroups > 0 && g.numberOfGroups <= 0) { numLearners_rdo.selected = true; _group_naming_btn.enabled = false; }
+		else { numGroups_rdo.selected = true; _group_naming_btn.enabled = false; }
+	}
 	
 	public function reDrawTroublesomeSteppersLater(){
 		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppers));
 	}
 	
 	private function  populateGroupingProperties(ga:GroupingActivity){
-		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		Debugger.log("populating Grouping Properties createGroupingUIID: " + ga.createGroupingUIID, Debugger.CRITICAL, "populateGroupingProperties", "PIC*");
+		
+		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_grouping');
 		
 		Debugger.log('This is the grouping object:',Debugger.GEN,'populateGroupingProperties','PropertyInspector');
 		ObjectUtils.printObject(g);
 		
 		//loop through combo to fins SI of our gate activity type
-		for (var i=0; i<groupType_cmb.dataProvider.length;i++){
-			if(g.groupingTypeID == groupType_cmb.dataProvider[i].data){
-				groupType_cmb.selectedIndex=i;
-			}
-		}
+		for (var i=0; i<groupType_cmb.dataProvider.length;i++)
+			if(g.groupingTypeID == groupType_cmb.dataProvider[i].data) groupType_cmb.selectedIndex=i;
 		
-		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
-			if(g.learnersPerGroup != null){
-				numLearners_stp.value = g.learnersPerGroup;
-			}else if(g.numberOfGroups != null){
-				numRandomGroups_stp.value = g.numberOfGroups;
-			}
-		}else{
-			if(g.maxNumberOfGroups != null){
-				numGroups_stp.value = g.maxNumberOfGroups;
-			}
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING) {
+			numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : 0;
+			numRandomGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : 0;
+		} else {
+			numGroups_stp.value = (g.maxNumberOfGroups != null) ? g.maxNumberOfGroups : 0;
 		}
 		
 	}