--- loncom/auth/lonauth.pm	2020/03/15 23:04:10	1.159
+++ loncom/auth/lonauth.pm	2020/10/20 01:38:12	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.159 2020/03/15 23:04:10 raeburn Exp $
+# $Id: lonauth.pm,v 1.161 2020/10/20 01:38:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -646,6 +646,11 @@ sub handler {
         ($is_balancer,$otherserver) =
             &Apache::lonnet::check_loadbalancing($form{'uname'},$form{'udom'},'login');
         if ($is_balancer) {
+            # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
+            my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
+            if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+                $otherserver = $found_server;
+            }
             if ($otherserver eq '') {
                 my $lowest_load;
                 ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($form{'udom'});
@@ -686,6 +691,8 @@ sub handler {
             }
             $r->internal_redirect($switchto);
         } else {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
             $r->print(&noswitch());
         }
         return OK;
@@ -716,6 +723,8 @@ sub handler {
                 }
                 $r->internal_redirect($switchto);
             } else {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->send_http_header;
                 $r->print(&noswitch());
             }
             return OK;