--- loncom/auth/lonlogin.pm	2006/08/18 17:44:44	1.77
+++ loncom/auth/lonlogin.pm	2006/09/19 19:03:08	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.77 2006/08/18 17:44:44 albertel Exp $
+# $Id: lonlogin.pm,v 1.80 2006/09/19 19:03:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,8 @@ sub handler {
     my $r = shift;
 
     &Apache::loncommon::get_unprocessed_cgi
-	($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'},
+	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
+	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
 	  'token']);
 
@@ -163,8 +164,7 @@ ENDFAILED
     my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
-    my $otherserver=
-	($ENV{'SERVER_PORT'} == 443?'https://':'HTTP://').$host_name;
+    my $otherserver= &Apache::lonnet::absolute_url($host_name);
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?