--- loncom/html/adm/helper/parameter.helper	2015/08/15 20:12:04	1.20
+++ loncom/html/adm/helper/parameter.helper	2015/08/28 22:45:11	1.22
@@ -152,12 +152,12 @@
       <choice computer="section" nextstate="CHOOSE_SECTION">
          . . . for a particular <b>section</b></choice>
       <condition>
-        <clause>return 1 if (&Apache::longroup::coursegroups())</clause>
+        <clause>return 1 if (($env{'request.course.groups'} ne '') || (&Apache::lonnet::allowed('mdg',$env{'request.course.id'}) && (&Apache::longroup::coursegroups())))</clause>
         <choice computer="group" nextstate="CHOOSE_GROUP">
            . . . for a particular <b>group</b></choice>
       </condition>
       <choice computer="student" nextstate="CHOOSE_STUDENT">
-         . . . for an individual <b>student</b></choice>
+         . . . for an individual <b>student</b> or <b>user</b></choice>
       </choices>
     </state>
 
@@ -174,16 +174,16 @@
       return &mt('Please select the group you wish to set the ' .
        &{$helper->{DATA}->{'dateType'}}() .
          ' for:').'<br />';</eval>
-    <group variable="GROUP_NAME" nextstate="FINISH" />
+    <group variable="GROUP_NAME" nextstate="FINISH" grouponly="1" />
     </state>
 
 
-  <state name="CHOOSE_STUDENT" title="Select Student">
+  <state name="CHOOSE_STUDENT" title="Select User">
     <eval>
-      return &mt('Please select the student you wish to set the ' .
+      return &mt('Please select the person you wish to set the ' .
        &{$helper->{DATA}->{'dateType'}}() .
          ' for:').'<br />';</eval>
-    <student variable="USER_NAME" nextstate="FINISH" coursepersonnel='1'/>
+    <student variable="USER_NAME" nextstate="FINISH" coursepersonnel="1" sectiononly="1" />
     </state>
 
   <state name="FINISH" title="Verify Selection">