--- loncom/auth/switchserver.pm	2020/10/25 02:25:27	1.35.2.4
+++ loncom/auth/switchserver.pm	2021/01/04 03:54:38	1.35.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.35.2.4 2020/10/25 02:25:27 raeburn Exp $
+# $Id: switchserver.pm,v 1.35.2.5 2021/01/04 03:54:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,7 +203,8 @@ sub handler {
     } else {
         $logmsg .= " (no role)";
     }
-    $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
+    my $ip = &Apache::lonnet::get_requestor_ip();
+    $logmsg .= ' '.$ip;
     &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
 			 $env{'user.home'},$logmsg);
 
@@ -248,7 +249,7 @@ sub handler {
         $otherbalcookie = $env{'request.balancercookie'};
     }
 
-    my %info=('ip'       => $ENV{'REMOTE_ADDR'},
+    my %info=('ip'       => $ip,
 	      'domain'   => $env{'user.domain'},
 	      'username' => $env{'user.name'},
 	      'role'     => $env{'form.role'},