diff --git a/web/template/header.php b/web/template/header.php
index 88fd6f65..f60acb4f 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -46,7 +46,6 @@
 <?php
 if (isset($_COOKIE["AURSID"])) {
 ?>
-	      <li><a href="/logout.php"><?php print __("Logout"); ?></a></li>
 	      <li><a href="/pkgsubmit.php"><?php print __("Submit"); ?></a></li>
           <li><a href="/packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li>
 <?php
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 4bfc579a..727afd0a 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -2,6 +2,9 @@
   <?php
   if (isset($_COOKIE["AURSID"])) {
     print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
+?>
+<br /><a href="/logout.php"><?php print __("Logout"); ?></a>
+<?php
   }
   else {
     if ($login_error) {