diff --git a/build/index.php b/build/index.php
index 869023b..65efc6a 100644
--- a/build/index.php
+++ b/build/index.php
@@ -1296,12 +1296,11 @@ class page_renderer
 					case "user-status":
 						if($env->is_logged_in)
 						{
-							$result .= "<span class='inflexible'>Logged in as " . self::render_username($env->user) . ".</span> "/* . page_renderer::$nav_divider*/;
-							$result .= "<span><a href='index.php?action=logout'>Logout</a></span>";
+							$result .= "<span class='inflexible'>" . self::render_username($env->user) . " <small>(<a href='index.php?action=logout'>Logout</a>)</small></span>";
 							$result .= page_renderer::$nav_divider;
 						}
 						else
-							$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>" . page_renderer::$nav_divider;
+							$result .= "<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>";
 						break;
 
 					case "search": // Displays a search bar
diff --git a/core.php b/core.php
index 84b3fda..d1c005a 100644
--- a/core.php
+++ b/core.php
@@ -869,12 +869,11 @@ class page_renderer
 					case "user-status":
 						if($env->is_logged_in)
 						{
-							$result .= "<span class='inflexible'>Logged in as " . self::render_username($env->user) . ".</span> "/* . page_renderer::$nav_divider*/;
-							$result .= "<span><a href='index.php?action=logout'>Logout</a></span>";
+							$result .= "<span class='inflexible'>" . self::render_username($env->user) . " <small>(<a href='index.php?action=logout'>Logout</a>)</small></span>";
 							$result .= page_renderer::$nav_divider;
 						}
 						else
-							$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>" . page_renderer::$nav_divider;
+							$result .= "<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>";
 						break;
 
 					case "search": // Displays a search bar