diff --git a/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml b/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
index e40a1cf2a..ba9029172 100644
--- a/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
@@ -11,4 +11,4 @@
     // owner isn't really who last modified this, is it?
     IUser owner = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().Owner;
 }
-@T("By {0}", owner == null ? "<null>" : owner.UserName)
\ No newline at end of file
+@T("By {0}", owner == null ? T("unknown").ToString() : Convert.ToString(Html.ItemDisplayText(owner)))
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Shapes/Views/User.cshtml b/src/Orchard.Web/Core/Shapes/Views/User.cshtml
index 5397b3862..8770c87ba 100644
--- a/src/Orchard.Web/Core/Shapes/Views/User.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/User.cshtml
@@ -3,7 +3,7 @@
 <div class="user-display">
     @if (WorkContext.CurrentUser != null) {
         <span class="user-actions welcome">
-            @T("Welcome, <strong>{0}</strong>!", new HtmlString(Html.ActionLink( WorkContext.CurrentUser.UserName, "ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }).ToString()))
+            @T("Welcome, <strong>{0}</strong>!", new HtmlString(Html.ActionLink( Convert.ToString(Html.ItemDisplayText(WorkContext.CurrentUser)), "ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }).ToString()))
         </span>
         <span class="user-actions">
             @Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }, new { rel = "nofollow" })
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml
index eda8ee05c..05df86f50 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml
@@ -55,7 +55,7 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
         @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
     }
 
-    <h2 id="commenter">@if (WorkContext.CurrentUser != null) { @T("Hi, {0}!", WorkContext.CurrentUser.UserName)}</h2>
+    <h2 id="commenter">@if (WorkContext.CurrentUser != null) { @T("Hi, {0}!", Convert.ToString(Html.ItemDisplayText(WorkContext.CurrentUser)))}</h2>
     <fieldset class="what">
     <ol>
         <li>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs
index f39097005..60ef824f8 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs
@@ -17,6 +17,7 @@ namespace Orchard.Users.Handlers {
 
             if (part != null) {
                 context.Metadata.Identity.Add("User.UserName", part.UserName);
+                context.Metadata.DisplayText = part.UserName;
             }
         }
     }
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
index 17b7cfb9a..20fb0d2f4 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
@@ -1,2 +1,2 @@
 @model dynamic
-@if (Model.CurrentUser != null) {<div id="login">@T("User:") @Model.CurrentUser.UserName | @Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" })</div>}
\ No newline at end of file
+@if (Model.CurrentUser != null) {<div id="login">@T("User:") @Convert.ToString(Html.ItemDisplayText((Orchard.ContentManagement.IContent)Model.CurrentUser)) | @Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" })</div>}
\ No newline at end of file