diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 88ef6d04f74..8cdbb48d36b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -32,7 +32,7 @@
 
 			<ul id="settings" class="svg">
 				<span id="expand">
-					<?php echo OC_User::getUser()?OC_User::getUser():'' ?>
+					<?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?>
 					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
 				</span>
 				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>