diff --git a/module/task/control.php b/module/task/control.php
index f64f0f141e..9ceb312589 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -46,18 +46,18 @@ class task extends control
     public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
     {
         $task = new stdClass();
-        $task->module      = $moduleID;
-        $task->assignedTo  = '';
-        $task->name        = '';
-        $task->story       = $storyID;
-        $task->type        = '';
-        $task->pri         = '';
-        $task->estimate    = '';
-        $task->desc        = '';
-        $task->estStarted  = '';
-        $task->deadline    = '';
-        $task->mailto      = '';
-        $task->color       = '';
+        $task->module     = $moduleID;
+        $task->assignedTo = '';
+        $task->name       = '';
+        $task->story      = $storyID;
+        $task->type       = '';
+        $task->pri        = '';
+        $task->estimate   = '';
+        $task->desc       = '';
+        $task->estStarted = '';
+        $task->deadline   = '';
+        $task->mailto     = '';
+        $task->color      = '';
         if($taskID > 0)
         {
             $task      = $this->task->getByID($taskID);
@@ -784,7 +784,7 @@ class task extends control
         }
 
         $task         = $this->view->task;
-        $members      = $this->loadModel('user')->getPairs('noletter');
+        $members      = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
         $task->nextBy = $task->assignedTo;
 
         $this->view->users = $members;
diff --git a/module/task/model.php b/module/task/model.php
index 4b4ff3bd74..e7db886ad2 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2356,11 +2356,11 @@ class taskModel extends model
      */
     public function getMemberPairs($task)
     {
-        $users   = $this->loadModel('user')->getPairs('noletter');
+        $users   = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
         $members = array('');
         foreach($task->team as $member)
         {
-            $members[$member->account] = $users[$member->account];
+            if(isset($users[$member->account])) $members[$member->account] = $users[$member->account];
         }
         return $members;
     }
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 0fe0e0ae8e..c85d672960 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -88,7 +88,7 @@
           <?php endif;?>
           <tr>
             <th><?php echo $lang->task->assignedTo;?></th>
-            <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td> 
+            <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>
           </tr>
           <tr class='<?php echo empty($task->team) ? 'hidden' : ''?>' id='teamTr'>
             <th><?php echo $lang->task->team;?></th>
@@ -198,7 +198,7 @@
         <table class='table table-form'>
           <?php foreach($task->team as $member):?>
           <tr>
-            <td class='w-80px'><?php echo html::select("team[]", $users, $member->account, "class='form-control chosen'")?></td>
+            <td class='w-80px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
             <td>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
@@ -217,7 +217,7 @@
           <?php endforeach;?>
           <?php for($i = 0; $i < 3; $i++):?>
           <tr>
-            <td class='w-150px'><?php echo html::select("team[]", $users, '', "class='form-control chosen'")?></td>
+            <td class='w-150px'><?php echo html::select("team[]", $members, '', "class='form-control chosen'")?></td>
             <td>
               <div class='input-group'>
                 <span class='input-group-addon'><?php echo $lang->task->estimate?></span>