diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index 8514be37..eb4e2d6e 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -173,8 +173,6 @@ UserDisplayDirective = ($template, $compile, $translate, $navUrls)->
     #     div.creator(tg-user-display, tg-user-id="{{ user.id }}")
     #
     # Requirements:
-    #   - model object must have the attributes 'created_date' and
-    #     'owner'(ng-model)
     #   - scope.usersById object is required.
 
     link = ($scope, $el, $attrs) ->
@@ -185,7 +183,7 @@ UserDisplayDirective = ($template, $compile, $translate, $navUrls)->
             photo: "/" + window._version + "/images/user-noimage.png"
         }
 
-        $scope.url = if $scope.owner?.is_active then $navUrls.resolve("user-profile", {username: $scope.owner.username}) else ""
+        $scope.url = if $scope.user.is_active then $navUrls.resolve("user-profile", {username: $scope.user.username}) else ""
 
         $scope.$on "$destroy", ->
             $el.off()
diff --git a/app/partials/common/components/user-display.jade b/app/partials/common/components/user-display.jade
index e3263d3b..3e6bb71a 100644
--- a/app/partials/common/components/user-display.jade
+++ b/app/partials/common/components/user-display.jade
@@ -1,4 +1,4 @@
-.user-avatar
+.user-avatar(ng-if="url")
     a(
         href="{{url}}"
         title="{{user.full_name_display}}"
@@ -8,6 +8,14 @@
             alt="{{user.full_name_display}}"
         )
 a.user-full-name(
+    ng-if="url"
     href="{{url}}"
     title="{{user.full_name_display}}"
 ) {{user.full_name_display}}
+
+.user-avatar(ng-if="!url")
+    img(
+        src="{{user.photo}}"
+        alt="{{user.full_name_display}}"
+    )
+span.user-full-name(ng-if="!url") {{user.full_name_display}}