diff --git a/include/nav.php b/include/nav.php
index 48b935aae3..cb08822802 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -2,9 +2,12 @@
 
 $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
 
-if(x($_SESSION['uid'])) {
+if(local_user()) {
 		$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
 }
+else {
+		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link" href="login">' . t('Login') . "</a>\r\n";
+}
 
 	$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\r\n";
 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index af5c69496d..ea176b7056 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -57,6 +57,13 @@ code {
 blockquote:before {
 	content: '>> ';
 }
+.nav-login-link {
+	float: right;
+	margin-left: 0px;
+	margin-right: 3px;
+	padding: 3px;
+	font-size: 70%;
+}
 
 /* NOTIFICATION */
 #notification-show-hide-link {