--- loncom/auth/lonlogin.pm	2003/04/03 21:53:51	1.40
+++ loncom/auth/lonlogin.pm	2003/05/08 21:50:54	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.40 2003/04/03 21:53:51 albertel Exp $
+# $Id: lonlogin.pm,v 1.41 2003/05/08 21:50:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,20 +89,22 @@ sub handler {
 
 # ---------------------------------------------------------- Determine own load
     my $loadavg;
-   {
-       my $loadfile=Apache::File->new('/proc/loadavg');
-       $loadavg=<$loadfile>;
-   }
+    {
+	my $loadfile=Apache::File->new('/proc/loadavg');
+	$loadavg=<$loadfile>;
+    }
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
+    my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?
-    if (($role eq 'access') && ($loadpercent>100.0)) {
-        $otherserver=Apache::lonnet::spareserver($loadpercent);
+    if (($role eq 'access') &&
+	(($userloadpercent>100.0)||($loadpercent>100.0))) {
+        $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
     }
 
 # -------------------------------------------------------- Set login parameters