--- loncom/auth/lonlogin.pm	2022/01/16 19:43:41	1.158.2.14
+++ loncom/auth/lonlogin.pm	2024/07/13 20:59:10	1.158.2.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.14 2022/01/16 19:43:41 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.17 2024/07/13 20:59:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -538,6 +538,7 @@ function toggleLClogin() {
             if (document.getElementById('LC_login_text')) {
                 document.getElementById('LC_login_text').innerHTML = '$samlnonsso';
             }
+            if ( document.client.uname ) { document.client.uname.focus(); }
             if (document.getElementById('LC_SSO_login')) {
                 document.getElementById('LC_SSO_login').style.display = 'none';
             }
@@ -967,7 +968,7 @@ sub redirect_page {
         $url .='?firsturl='.$querystring;
     }
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                                    {'redirect' => [0,$url],});
+                                                    {'redirect' => [0,$url,'',1]});
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }