diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index b402cd49ad..9219ce2d2d 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -90,10 +90,14 @@
             <?php $disableAssignedTo = (isset($teams[$taskID]) and $tasks[$taskID]->assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?>
             <?php $disableHour = isset($teams[$taskID]) ? "disabled='disabled'" : '';?>
             <?php
+            $taskMembers = array();
             if(isset($teams[$taskID]))
             {
-                $taskMembers = array_intersect_key($members, $teams[$taskID]);
-                $taskMembers = array('' => '', 'ditto' => $this->lang->task->ditto) + $taskMembers;
+                $teamAccounts = array_keys($teams[$taskID]);
+                foreach($teamAccounts as $teamAccount)
+                {
+                    $taskMembers[] = $members[$teamAccount];
+                }
             }
             else
             {
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index b894ad85ca..41ce98deaa 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -122,6 +122,21 @@
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>
                 <?php $disableAssignedTo = (!empty($task->team) and $task->assignedTo != $this->app->user->account) ? "disabled='disabled'" :'';?>
+                <?php
+                $taskMembers = array();
+                if(!empty($task->team))
+                {
+                    $teamAccounts = array_keys($task->team);
+                    foreach($teamAccounts as $teamAccount)
+                    {
+                        $taskMembers[] = $members[$teamAccount];
+                    }
+                }
+                else
+                {
+                    $taskMembers = $members;
+                }
+                ?>
                 <?php $taskMembers = !empty($task->team) ? array_intersect_key($members, $task->team) : $members;?>
                 <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $taskMembers, $task->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></span></td>
               </tr>