diff --git a/library/Fiktiv/View/Helper/AuthLink.php b/library/Fiktiv/View/Helper/AuthLink.php
index 2bcd6ca..91b580e 100644
--- a/library/Fiktiv/View/Helper/AuthLink.php
+++ b/library/Fiktiv/View/Helper/AuthLink.php
@@ -14,16 +14,31 @@ class Fiktiv_View_Helper_AuthLink extends Zend_View_Helper_Abstract
         $prefix = '';
 
         if ($auth->hasIdentity()) {
+            $identity = $auth->getIdentity();
             $options['action'] = 'logout';
             $display = 'u:logout';
 
+            $prefix = '<a href="'.$this->view->url(array('controller' => 'profile'), 'default').'">';
 
-            $prefix = $auth->getIdentity()->firstName.' (<a href="'.$this->view->url(array('controller' => 'profile'), 'default').'">Profile</a>) ';
+            if (strlen($identity->firstName)) {
+                $prefix .= $identity->firstName;
+                
+                if (strlen($identity->lastName)) {
+                    $prefix .= ' ' . $identity->lastName[0];
+                }
+            } else {
+                $prefix .= $this->view->translate('Unknown');
+            }
+
+            $prefix .= '</a> | ';
         } else {
             $options['action'] = 'login';
             $display = 'u:login';
         }
 
-        return $prefix.'<a href="' . $this->view->url($options, 'auth') . '">' . $this->view->translate($display) . '</a>';
+        return $prefix
+             . '<a href="' . $this->view->url($options, 'auth') . '">'
+             . $this->view->translate($display)
+             . '</a>';
     }
-}
\ No newline at end of file
+}