--- loncom/auth/lonroles.pm	2003/08/05 12:52:23	1.65
+++ loncom/auth/lonroles.pm	2003/09/17 17:50:49	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.65 2003/08/05 12:52:23 www Exp $
+# $Id: lonroles.pm,v 1.70 2003/09/17 17:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,7 +171,11 @@ ENDENTERKEY
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($ENV{'form.orgurl'}) && 
 			    ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
-			    $r->internal_redirect($ENV{'form.orgurl'});
+			    my $dest=$ENV{'form.orgurl'};
+			    if ( $Apache::lonnet::mod_perl_version() == 2 ) {
+				&Apache::lonnet::cleanenv();
+			    }
+			    $r->internal_redirect($dest);
 			    return OK;
 			} else {
 			    unless ($ENV{'request.course.id'}) {
@@ -179,7 +183,7 @@ ENDENTERKEY
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-	 '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>';
+	 '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>'.$ferr;
 			    }
 
 			    # Check to see if the user is a CC entering a course 
@@ -570,6 +574,7 @@ ENDHEADER
 	    }
 	}
     }
+    $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
 	$r->print('<p><small><i>This is LON-CAPA '.
 		  $r->dir_config('lonVersion').'</i></small></p>');