--- loncom/auth/lonroles.pm	2000/10/04 14:09:01	1.10
+++ loncom/auth/lonroles.pm	2000/10/05 19:15:34	1.12
@@ -5,7 +5,7 @@
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
 # 11/23 Gerd Kortemeyer)
 # 1/14,03/06,06/01,07/22,07/24,07/25,
-# 09/04,09/06,09/28,09/29,09/30,10/2 Gerd Kortemeyer
+# 09/04,09/06,09/28,09/29,09/30,10/2,10/5 Gerd Kortemeyer
 #
 package Apache::lonroles;
 
@@ -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;
+		      }
                    }
                }
             } 
@@ -75,8 +77,10 @@ ENDHEADER
 # ------------------------------------------ Get Error Message from Environment
 
     my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$ENV{'user.error.msg'});
-    $r->log_reason(
- "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
+    if ($ENV{'user.error.msg'}) {
+       $r->log_reason(
+     "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
+    }
 
 # ---------------------------------------------------------------- Who is this?
 
@@ -123,7 +127,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>');
     }