--- loncom/auth/lonroles.pm	2020/02/04 01:27:04	1.343
+++ loncom/auth/lonroles.pm	2021/04/19 15:05:55	1.345
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.343 2020/02/04 01:27:04 raeburn Exp $
+# $Id: lonroles.pm,v 1.345 2021/04/19 15:05:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -505,6 +505,7 @@ sub handler {
 				 my $end_page=&Apache::loncommon::end_page();
 				 my $buttontext=&mt('Enter Course');
 				 my $message=&mt('Successfully registered key');
+                                 my $ip = &Apache::lonnet::get_requestor_ip();
 				 my $assignresult=
 				     &Apache::lonnet::assign_access_key(
 						     $env{'form.newkey'},
@@ -513,7 +514,7 @@ sub handler {
                                                      $env{'user.domain'},
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
-                                                        ,$ENV{'REMOTE_ADDR'}
+                                                        ,$ip
                                                         ,&Apache::lonlocal::locallocaltime()
                                                         ,$trolecode)
                                                      );
@@ -652,6 +653,13 @@ ENDENTERKEY
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
+                                if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+                                    if (($env{'form.orgurl'} ne '') && ($env{'form.symb'} ne '')) {
+                                        unless (&Apache::lonnet::symbverify($env{'form.symb'},$env{'form.orgurl'}) {
+                                            $dest=$env{'form.orgurl'};
+                                        }
+                                    } 
+                                }
                                 if ($dest =~ m{^/adm/coursedocs\?folderpath}) {
                                     if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { 
                                         my $chome = &Apache::lonnet::homeserver($cnum,$cdom);