--- loncom/auth/migrateuser.pm	2022/08/30 15:32:51	1.25.2.5.2.7
+++ loncom/auth/migrateuser.pm	2023/01/23 00:59:22	1.25.2.5.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.25.2.5.2.7 2022/08/30 15:32:51 raeburn Exp $
+# $Id: migrateuser.pm,v 1.25.2.5.2.8 2023/01/23 00:59:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,6 +203,14 @@ sub ip_changed {
                 $info{$name} = $dataref->{$name};
             }
         }
+        if ($info{'origurl'} eq '/adm/email') {
+            if (($dataref->{'display'}) && ($dataref->{'mailrecip'})) {
+                if (&unescape($dataref->{'mailrecip'}) eq $dataref->{'username'}.':'.$dataref->{'domain'}) {
+                    $info{'display'} = $dataref->{'display'};
+                    $info{'mailrecip'} = $dataref->{'mailrecip'};
+                }
+            }
+        }
         my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
         unless ($iptoken eq 'conlost') {
             $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
@@ -565,6 +573,13 @@ sub handler {
                         $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
                     }
                 }
+                if ($desturl eq '/adm/email') {
+                    if (($data{'display'}) && ($data{'mailrecip'})) {
+                        if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") {
+                            $form{'display'} = &unescape($data{'display'});
+                        }
+                    }
+                }
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				      $home,$desturl,$extra_env,\%form,'',