--- loncom/auth/lonroles.pm	2000/10/04 14:09:01	1.10
+++ loncom/auth/lonroles.pm	2000/10/04 15:29:50	1.11
@@ -49,8 +49,10 @@ sub handler {
                    my ($cdom,$cnum)=split(/\//,$where);
                    if ($cnum) {
 		      &Apache::lonuserstate::readmap($where);
-                      $r->internal_redirect($ENV{'form.orgurl'});
-                      return OK;
+                      if ($ENV{'form.orgurl'}) {
+                         $r->internal_redirect($ENV{'form.orgurl'});
+                         return OK;
+		      }
                    }
                }
             } 
@@ -123,7 +125,7 @@ ENDHEADER
         } else {
 	   $r->print("<h2>Enter a Course</h2>\n");
         }
-        $r->print('<form method=post action="'.$r->uri.'">');
+        $r->print('<form method=post action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type=hidden name=orgurl value="'.$fn.'">');
         $r->print('<input type=hidden name=selectrole value=1>');
     }