diff --git a/source/webui/pages/login.php b/source/webui/pages/login.php
index 719acaf..f8a4da8 100644
--- a/source/webui/pages/login.php
+++ b/source/webui/pages/login.php
@@ -3,13 +3,14 @@
 $main = StatusBoard_Main::instance();
 $request = $main->request();
 $auth = $main->auth();
+$log = $main->log();
 
 $authenticated = false;
 $authentication_failed = false;
 
 if ($request->exists('do')) {
-    $username = StatusBoard_Main::issetelse($_POST['username'], Sihnon_Exception_InvalidParameters);
-    $password = StatusBoard_Main::issetelse($_POST['password'], Sihnon_Exception_InvalidParameters);
+    $username = StatusBoard_Main::issetelse($_POST['username'], 'Sihnon_Exception_InvalidParameters');
+    $password = StatusBoard_Main::issetelse($_POST['password'], 'Sihnon_Exception_InvalidParameters');
     
     try {
         $auth->authenticate($username, $password);
diff --git a/source/webui/pages/navigation.php b/source/webui/pages/navigation.php
index 5d61883..7a7cbf6 100644
--- a/source/webui/pages/navigation.php
+++ b/source/webui/pages/navigation.php
@@ -1,18 +1,16 @@
 <?php
 
-$display_login = true;
-$display_admin = false;
+$authenticated = false;
+$user = null;
 
 $auth = StatusBoard_Main::instance()->auth();
 if ($auth->isAuthenticated()) {
-    $display_login = false;
+    $authenticated = true;
+    $user = $auth->authenticatedUser();
 }
 
-if ($auth->isAdministrator()) {
-    $display_admin = true;
-}
-
-$this->smarty->assign('display_login', $display_login);
-$this->smarty->assign('display_admin', $display_admin);
+$this->smarty->assign('authenticated', $authenticated);
+$this->smarty->assign('auth', $auth);
+$this->smarty->assign('user', $user);
 
 ?>
\ No newline at end of file
diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl
index 031bb6b..51df6ee 100644
--- a/source/webui/templates/navigation.tpl
+++ b/source/webui/templates/navigation.tpl
@@ -3,17 +3,18 @@
 <ul class="nav">
     <li class="active"><a href="{$base_uri}home/" title="Home">Home</a></li>
     
-    {if $display_admin}
-        <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
-    {/if}
-
-    {if $display_login}
-        <li><a href="{$base_uri}login/" title="Login">Login</a></li>
-    {else}
+    {if $authenticated}
+        {if $auth->isAdministrator()}
+            <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
+        {/if}
         <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
+    {else}
+        <li><a href="{$base_uri}login/" title="Login">Login</a></li>
     {/if}
 </ul>
 
-<p class="pull-right">
-    Logged in as <a href="#">username</a>
-</p>
\ No newline at end of file
+{if $authenticated}
+    <p class="pull-right">
+        Logged in as <a href="#">{$user->username}</a>
+    </p>
+{/if}
\ No newline at end of file