--- loncom/auth/switchserver.pm	2022/09/13 12:22:14	1.63
+++ loncom/auth/switchserver.pm	2023/06/02 01:20:26	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.63 2022/09/13 12:22:14 raeburn Exp $
+# $Id: switchserver.pm,v 1.65 2023/06/02 01:20:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -330,6 +330,12 @@ sub handler {
     }
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
+        if ($env{'form.origurl'} eq '/adm/email') {
+            if ($env{'request.display'} && ($env{'request.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}")) {
+                $info{'display'} = &escape($env{'request.display'});
+                $info{'mailrecip'} = &escape($env{'request.mailrecip'});
+            }
+        }
     }
     if ($env{'form.symb'}) {
         $info{'symb'} = $env{'form.symb'};
@@ -356,7 +362,7 @@ sub handler {
     }
     if ($env{'request.linkprot'}) {
         $info{'linkprot'} = $env{'request.linkprot'};
-        foreach my $item ('linkprotuser','linkprotexit') {
+        foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
             if ($env{'request.'.$item}) {
                 $info{$item} = $env{'request.'.$item};
             }