diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index 02dec85c..3ad90320 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -283,9 +283,6 @@ KanbanUserDirective = ($log) ->
     <figure class="avatar">
         <a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>>
             <img src="<%= imgurl %>" alt="<%- name %>" class="avatar">
-            <span class="assigned-to">
-                <span><%- name %></span>
-            </span>
         </a>
     </figure>
     """)
@@ -312,6 +309,7 @@ KanbanUserDirective = ($log) ->
 
             html = template(ctx)
             $el.html(html)
+            $el.parent().find("span.task-assigned").html(ctx.name)
 
         bindOnce $scope, "project", (project) ->
             if project.my_permissions.indexOf("modify_us") > -1
diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index 121c742d..b97de6d7 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -232,7 +232,6 @@ TaskboardUserDirective = ($log) ->
     <figure class="avatar">
         <a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>>
             <img src="<%= imgurl %>" alt="<%- name %>">
-            <figcaption><%- name %></figcaption>
         </a>
     </figure>
     """)
@@ -259,7 +258,7 @@ TaskboardUserDirective = ($log) ->
 
             html = template(ctx)
             $el.html(html)
-
+            $el.parent().find("span.task-assigned").html(ctx.name)
 
         bindOnce $scope, "project", (project) ->
             if project.my_permissions.indexOf("modify_task") > -1
diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade
index 11f382c5..f771222a 100644
--- a/app/partials/views/components/kanban-task.jade
+++ b/app/partials/views/components/kanban-task.jade
@@ -1,9 +1,9 @@
 div.kanban-tagline
     a.kanban-tag(ng-repeat="tag in us.tags", href="", tg-bo-title="tag", tg-colorize-tag-background="tag")
 div.kanban-task-inner
-    div(tg-kanban-user-avatar="us.assigned_to", ng-model="us")
+    div(tg-kanban-user-avatar="us.assigned_to", ng-model="us", click="ctrl.editUsAssignedTo(task)")
     div.task-text
-        span.task-assigned Username
+        span.task-assigned
         span.task-num(tg-bo-ref="us.ref")
         a.task-name(href="", title="", tg-bind-html="us.subject",
                     tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")
diff --git a/app/partials/views/components/taskboard-task.jade b/app/partials/views/components/taskboard-task.jade
index d3af7078..f3983b3a 100644
--- a/app/partials/views/components/taskboard-task.jade
+++ b/app/partials/views/components/taskboard-task.jade
@@ -3,7 +3,7 @@ div.taskboard-tagline
 div.taskboard-task-inner
     div(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)")
     p.taskboard-text
-        span.task-assigned Username
+        span.task-assigned
         span.task-num(tg-bo-ref="task.ref")
         a.task-name(href="", title="See task details", tg-bind-html="task.subject",
                     tg-nav="project-tasks-detail:project=project.slug,ref=task.ref")