--- loncom/interface/createaccount.pm	2009/02/07 00:59:17	1.28
+++ loncom/interface/createaccount.pm	2009/03/12 13:59:49	1.30
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.28 2009/02/07 00:59:17 raeburn Exp $
+# $Id: createaccount.pm,v 1.30 2009/03/12 13:59:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ sub handler {
     my $start_page;
 
     my $handle = &Apache::lonnet::check_for_valid_session($r);
-    if ($handle ne '') {
+    if (($handle ne '') && ($handle !~ /^publicuser_\d+$/)) {
         $start_page =
             &Apache::loncommon::start_page('Already logged in');
         my $end_page =
@@ -486,8 +486,11 @@ sub login_box {
                '<input type="button" name="username_validation" value="'.
                $submit_text.'" onclick="javascript:send()" />'."\n".
                &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::end_pick_box().'<br /><br />'."\n".
-               '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
+               &Apache::lonhtmlcommon::end_pick_box();
+    $output .= '<p>'.
+               '<a href="/adm/resetpw">'.&mt('Forgot password?').'</a>'.
+               '</p>'."\n";
+    $output .= '<input type="hidden" name="lextkey" value="'.$lextkey.'">'."\n".
                '<input type="hidden" name="uextkey" value="'.$uextkey.'">'."\n".
                '</form>';
     return $output;