diff --git a/common.inc.php b/common.inc.php
index 2cd0783..357ad9e 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -439,7 +439,9 @@ else
 if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
 {
 ?>
-<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php?action=logout"><?=i18n("School Logout")?></a></li><?
+<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php"><?=i18n("School Access")?></a></li>
+<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php?action=logout"><?=i18n("School Logout")?></a></li>
+<?
 }
 else
 {
diff --git a/schoolaccess.php b/schoolaccess.php
index fcceaf3..232945a 100644
--- a/schoolaccess.php
+++ b/schoolaccess.php
@@ -13,14 +13,15 @@ if($_POST['schoolid'] && $_POST['accesscode'])
 	else
 		$errormsg="Invalid School ID or Access Code";
 }
-send_header(i18n("School Access"));
 
 if($_GET['action']=="logout")
 {
 	unset($_SESSION['schoolid']);
 	unset($_SESSION['schoolaccesscode']);
-	echo happy(i18n("You have been logged out from the school access page"));
+	$happymsg=i18n("You have been logged out from the school access page");
 }
+send_header(i18n("School Access"));
+
 
 
 if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
@@ -206,6 +207,7 @@ if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
 else
 {
 	if($errormsg) echo "<font color=red><b>$errormsg</b></font>";
+	if($happymsg) echo happy($happymsg);
 
 	echo "	<form method=POST action=\"schoolaccess.php\">\n";
 	echo i18n("Welcome to the School Access Page.  This page allows your school to provide several key pieces of information for the fair, as well as feedback about the schools experience with/at the fair.");