--- loncom/auth/lonlogin.pm	2006/05/30 12:45:24	1.75
+++ loncom/auth/lonlogin.pm	2006/08/29 20:12:43	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.75 2006/05/30 12:45:24 www Exp $
+# $Id: lonlogin.pm,v 1.79 2006/08/29 20:12:43 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']);
 
@@ -145,6 +146,7 @@ ENDFAILED
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
     my $version = $r->dir_config('lonVersion');
+    my $host_name = $Apache::lonnet::hostname{$lonhost};
 
 # --------------------------------------------- Default values for login fields
 
@@ -162,7 +164,7 @@ ENDFAILED
     my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
-    my $otherserver='http://'.$ENV{'SERVER_NAME'};
+    my $otherserver= &Apache::loncommon::absolute_url($host_name);
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?