--- loncom/auth/lonlogin.pm	2020/10/26 01:52:15	1.181
+++ loncom/auth/lonlogin.pm	2021/05/03 15:27:44	1.183
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.181 2020/10/26 01:52:15 raeburn Exp $
+# $Id: lonlogin.pm,v 1.183 2021/05/03 15:27:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,6 +143,10 @@ sub handler {
             if ($balancer_token) {
                 $dest .=  (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token;
             }
+            unless ($found_server eq $lonhost) {
+                my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server);
+                $hostname = $alias if ($alias ne '');
+            }
             my $url = $protocol.'://'.$hostname.$dest;
             my $start_page =
                 &Apache::loncommon::start_page('Switching Server ...',undef,
@@ -605,7 +609,7 @@ ENDSCRIPT
         my $omitextra;
         if ($headextra_exempt ne '') {
             my @exempt = split(',',$headextra_exempt);
-            my $ip = $ENV{'REMOTE_ADDR'};
+            my $ip = &Apache::lonnet::get_requestor_ip();
             if (grep(/^\Q$ip\E$/,@exempt)) {
                 $omitextra = 1;
             }
@@ -848,7 +852,7 @@ sub check_loginvia {
     my $output;
     if ($loginvia ne '') {
         my $noredirect;
-        my $ip = $ENV{'REMOTE_ADDR'};
+        my $ip = &Apache::lonnet::get_requestor_ip();   
         if ($ip eq '127.0.0.1') {
             $noredirect = 1;
         } else {