diff --git a/app/coffee/modules/taskboard/lightboxes.coffee b/app/coffee/modules/taskboard/lightboxes.coffee
index a3a38787..3d9505ae 100644
--- a/app/coffee/modules/taskboard/lightboxes.coffee
+++ b/app/coffee/modules/taskboard/lightboxes.coffee
@@ -51,6 +51,7 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootScope) ->
                 user_story: usId
                 is_archived: false
                 status: $scope.project.default_task_status
+                assigned_to: null
             }
             isNew = true
             editDescription($scope, $el)
diff --git a/app/partials/views/modules/lightbox_add-edit-task.jade b/app/partials/views/modules/lightbox_add-edit-task.jade
index 5e630048..77d201f5 100644
--- a/app/partials/views/modules/lightbox_add-edit-task.jade
+++ b/app/partials/views/modules/lightbox_add-edit-task.jade
@@ -7,11 +7,10 @@ form
     fieldset
         select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList",
                placeholder="Task status")
-    // TODO: Assigned to
-    //fieldset
-    //    select(ng-model="task.assigned_to", ng-options="s.id as s.full_name for s in userList",
-    //           placeholder="Assigned to")
-    //        option(value)-------
+    fieldset
+        select(ng-model="task.assigned_to", ng-options="s.id as s.full_name_display for s in users",
+               placeholder="Assigned to")
+            option(value="") Unassigned
     fieldset
         input(type="text", placeholder="Tags", tg-tags, ng-model="task.tags")
     fieldset