diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee
index ee02dc8a..89f98183 100644
--- a/app/coffee/modules/controllerMixins.coffee
+++ b/app/coffee/modules/controllerMixins.coffee
@@ -34,7 +34,7 @@ class PageMixin
         return promise.then (results) =>
             [users, roles] = results
 
-            @scope.users = _.sortBy(users, "full_name_display")
+            @scope.users = _.sortBy(users, "full_name")
             @scope.usersById = groupBy(@scope.users, (e) -> e.id)
 
             @scope.roles = _.sortBy(roles, "order")
diff --git a/app/partials/views/components/taskboard-task.jade b/app/partials/views/components/taskboard-task.jade
index ca161336..b847e31d 100644
--- a/app/partials/views/components/taskboard-task.jade
+++ b/app/partials/views/components/taskboard-task.jade
@@ -3,8 +3,8 @@ div.taskboard-tagline
 div.taskboard-task-inner
     figure.avatar
         a(href="", title="UserName")
-            img.avatar(src="http://thecodeplayer.com/u/uifaces/12.jpg", alt="username")
-            figcaption Username
+            img.avatar(src="{{ usersById[task.assigned_to].avatar_url }}", alt="{{ usersById[task.assigned_to].full_name }}")
+            figcaption {{ usersById[task.assigned_to].full_name }}
     p.taskboard-text
         span.task-num(ng-bind="task.ref")
         span.task-name(ng-bind="task.subject")
diff --git a/app/partials/views/modules/lightbox_add-edit-task.jade b/app/partials/views/modules/lightbox_add-edit-task.jade
index 77d201f5..79ad88db 100644
--- a/app/partials/views/modules/lightbox_add-edit-task.jade
+++ b/app/partials/views/modules/lightbox_add-edit-task.jade
@@ -8,7 +8,7 @@ form
         select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList",
                placeholder="Task status")
     fieldset
-        select(ng-model="task.assigned_to", ng-options="s.id as s.full_name_display for s in users",
+        select(ng-model="task.assigned_to", ng-options="s.id as s.full_name for s in users",
                placeholder="Assigned to")
             option(value="") Unassigned
     fieldset