--- loncom/interface/resetpw.pm	2020/02/09 04:43:20	1.47
+++ loncom/interface/resetpw.pm	2020/12/18 15:23:02	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.47 2020/02/09 04:43:20 raeburn Exp $
+# $Id: resetpw.pm,v 1.48 2020/12/18 15:23:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -482,7 +482,8 @@ sub send_token {
 
     my $now = time;
     my $temppasswd = &create_passwd();
-    my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
+    my $ip = &Apache::lonnet::get_requestor_ip(); 
+    my %info = ('ip'         => $ip,
 		'time'       => $now,
 		'domain'     => $udom,
 		'username'   => $uname,
@@ -723,7 +724,8 @@ sub reset_passwd {
                     my $now = &Apache::lonlocal::locallocaltime(time);
                     my $domdesc = 
 			&Apache::lonnet::domain($data{'domain'},'description');
-                    my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+                    my $ip = &Apache::lonnet::get_requestor_ip();
+                    my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ip,$contact_name,$contact_email)."\n";
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);
                     my $confirm_msg;