--- loncom/interface/lonpickcourse.pm	2007/10/22 22:16:38	1.66
+++ loncom/interface/lonpickcourse.pm	2007/11/06 04:39:19	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.66 2007/10/22 22:16:38 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.67 2007/11/06 04:39:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,7 +93,8 @@ sub handler {
 
     if ($env{'form.form'} eq 'portform') {
         $lastaction = 'document.courselist.submit()';
-    } elsif ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') {
+    } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' &&
+        !$multiple)) {
         $lastaction = 
              'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
              'document.courselist.submit();';
@@ -347,7 +348,10 @@ sub build_filters {
 	    if ($formname eq 'portform') {
 		$filter->{$item} ||= $env{'user.domain'};
 		$allow_blank=0;
-	    }
+	    } elsif ($formname eq 'studentform') {
+                $filter->{$item} ||= $env{'request.role.domain'};
+                $allow_blank=0;
+            }
             $domainselectform =
 		&Apache::loncommon::select_dom_form($filter->{$item},
 						    'domainfilter',