--- loncom/auth/lonlogin.pm	2003/03/10 14:29:37	1.38
+++ loncom/auth/lonlogin.pm	2003/04/03 21:53:51	1.40
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.38 2003/03/10 14:29:37 www Exp $
+# $Id: lonlogin.pm,v 1.40 2003/04/03 21:53:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,8 +50,9 @@ sub handler {
 
 
     &Apache::loncommon::get_unprocessed_cgi
-     ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
-
+     ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+      ['interface','username','domain','firsturl']);
+ 
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
 
@@ -65,8 +66,11 @@ sub handler {
     }
 
     my $fullgraph=($ENV{'form.interface'} ne 'textual');
-
-    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
+    my $port_to_use=$r->dir_config('lonhttpdPort');
+    if (!defined($port_to_use)) {
+	$port_to_use='8080';
+    }
+    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');