diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a16d2c9e55..fb63200123 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,7 +1,7 @@
- <?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>
+ <?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getDisplayName()?' ('.OC_User::getDisplayName().') ':'' ?>
diff --git a/lib/user.php b/lib/user.php
index d6d47293cb..f9c8f48568 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -351,7 +351,7 @@ class OC_User {
* @return string uid or false
*/
public static function getDisplayName() {
- if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ) {
+ if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
return $_SESSION['display_name'];
}
else{