--- loncom/interface/lonpickcourse.pm	2005/11/15 20:46:40	1.35
+++ loncom/interface/lonpickcourse.pm	2005/12/15 23:31:32	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.35 2005/11/15 20:46:40 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.36 2005/12/15 23:31:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,7 +149,7 @@ ENDDOCUMENT
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick($roledom);
+        $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
     $r->print(<<ENDSCRIPT);
@@ -329,8 +329,11 @@ ENDSCRIPT
         $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".
                    '<input type="hidden" name="pickedcourse" value="" />'."\n".
                    '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".
-                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n".
-                   '</form>');
+                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n");
+        if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
+           $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
+        }
+        $r->print("</form>\n");
     }
     $r->print('</body></html>');
     return OK;