--- loncom/interface/lonpickcourse.pm	2007/03/08 01:58:45	1.62
+++ loncom/interface/lonpickcourse.pm	2007/06/01 18:07:47	1.63.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.62 2007/03/08 01:58:45 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.63.2.1 2007/06/01 18:07:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -279,8 +279,15 @@ sub build_filters {
             }
         }
         if ($item eq 'domainfilter') {
+	    my $allow_blank = 1;
+	    if ($formname eq 'portform') {
+		$filter->{$item} ||= $env{'user.domain'};
+		$allow_blank=0;
+	    }
             $domainselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);
+		&Apache::loncommon::select_dom_form($filter->{$item},
+						    'domainfilter',
+						    $allow_blank);
         } elsif ($item eq 'ownerdomfilter') {
             $ownerdomselectform =
      &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
@@ -356,9 +363,9 @@ $multelement
     if ($domainselectform) {
         $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
     }
-    if ($typeselectform) {
-        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
-    }
+#    if ($typeselectform) {
+#        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
+#    }
     if ($instcodeform) {
         $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
     }