--- nsdl/nsdlloncapaorg/lonlogin.pm	2003/07/28 20:30:21	1.2
+++ nsdl/nsdlloncapaorg/lonlogin.pm	2003/08/29 14:50:13	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
-# Login Screen
+# Login Screen NSDL version
 #
-# $Id: lonlogin.pm,v 1.2 2003/07/28 20:30:21 www Exp $
+# $Id: lonlogin.pm,v 1.4 2003/08/29 14:50:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,10 +101,12 @@ sub handler {
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
+    my $escfirsturl=&Apache::lonnet::escape($firsturl);
 # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') &&
 	(($userloadpercent>100.0)||($loadpercent>100.0))) {
-        $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+        my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
+	if ($unloaded) { $otherserver=$unloaded; }
     }
 
 # -------------------------------------------------------- Set login parameters
@@ -272,7 +274,7 @@ ENDSERVERFORM
   <tr>
 
    <!-- Row 1 Columns 2-4 -->
-   <td width="100%" colspan=4 bgcolor="$sidebg"><h1><font color="$pgbg">Welcome to the LON-CAPA NSDL Gateway</font></h1><a href="/cgi-bin/signon.pl"><h3><font color="$pgbg">Sign up for a Guest Login</font></h3></a></td>
+   <td width="100%" colspan=4 bgcolor="$sidebg"><h1><font color="$pgbg">Welcome to the LON-CAPA NSDL Gateway</font></h1><a href="/cgi-bin/signon.pl?$escfirsturl"><h3><font color="$pgbg">Sign up for a Guest Login</font></h3></a></td>
   </tr>
 
   <!-- The gray bar that starts the two table frames -->