--- loncom/auth/lonlogin.pm	2005/06/14 20:09:13	1.67
+++ loncom/auth/lonlogin.pm	2005/11/23 20:46:04	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.67 2005/06/14 20:09:13 albertel Exp $
+# $Id: lonlogin.pm,v 1.69 2005/11/23 20:46:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ sub handler {
 	my $handle=$lonid->value;
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+        if ((-e "$lonidsdir/$handle.id") && ($handle ne '') && ($handle!~/^publicuser\_/)) {
 # Indeed, a valid token is found
 	    my $bodytag=&Apache::loncommon::bodytag('Already logged in');
 	    $r->print(<<ENDFAILED);
@@ -108,6 +108,10 @@ ENDFAILED
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
+    my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
+    foreach my $posdom (&Apache::lonnet::current_machine_domains()) {
+	if ($posdom eq $testdomain) { $domain=$testdomain; }
+    }
     if (($env{'form.domain'}) && 
 	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
 	$domain=$env{'form.domain'};