diff --git a/module/task/control.php b/module/task/control.php
index c7e9ba04ab..1dc25237ee 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1880,6 +1880,16 @@ class task extends control
 
         if(!isset($this->view->members[$this->view->task->finishedBy])) $this->view->members[$this->view->task->finishedBy] = $this->view->task->finishedBy;
 
+        if(!empty($this->view->task->team))
+        {
+            $teamAccounts = array_column($this->view->task->team, 'account');
+            $teamMembers  = array();
+            foreach($this->view->members as $account => $name)
+            {
+                if(!$account or in_array($account, $teamAccounts)) $teamMembers[$account] = $name;
+            }
+            $this->view->teamMembers = $teamMembers;
+        }
         $this->view->title      = $this->view->execution->name . $this->lang->colon . $this->lang->task->activate;
         $this->view->position[] = $this->lang->task->activate;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
diff --git a/module/task/js/activate.js b/module/task/js/activate.js
index 32649933f9..9a167a2093 100644
--- a/module/task/js/activate.js
+++ b/module/task/js/activate.js
@@ -63,11 +63,15 @@ $(function()
         $('.teamTemplate select, .teamTemplate input').val('');
         $('.teamTemplate input[name^=teamConsumed]').val('0');
         $('.teamTemplate select').trigger('chosen:updated');
-        var trCount  = $('#taskTeamEditor tr').length;
-        var tmpCount = $('#taskTeamEditor select:disabled').length;
 
-        var removeNum = tmpCount > 6 ? 1 : (5 - tmpCount);
-        $('#taskTeamEditor tr.teamTemplate').filter(':gt(' + removeNum + ')').remove();
+        /* Reset team modal. */
+        var oldTeamCount = $('#taskTeamEditor select:disabled').length;
+        var removeCount  = oldTeamCount > 6 ? 1 : (5 - oldTeamCount);
+        $('#taskTeamEditor tr.teamTemplate').filter(':gt(' + removeCount + ')').remove();
+
+        /* Reset assignedTo select.*/
+        $('#assignedTo_chosen').remove();
+        $('#assignedTo').replaceWith(assignedToHtml);
 
         if(showTeam)
         {
@@ -82,6 +86,7 @@ $(function()
             $('#left').removeAttr('readonly');
             $('#dataPlanGroup').addClass('required');
         }
+        $('#assignedTo').chosen();
         $('#assignedTo').trigger('chosen:updated');
     });
 
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 35cdba2f51..df0abf3d00 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -25,6 +25,7 @@
 <?php $isMultiple = !empty($task->team);?>
 <?php js::set('isMultiple', $isMultiple);?>
 <?php js::set('taskMode', $task->mode);?>
+<?php js::set('assignedToHtml', html::select('assignedTo', $teamMembers, '', "class='form-control'"));?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -50,7 +51,7 @@
           <th class='thWidth'><?php echo $lang->task->assignedTo;?></th>
           <td class='w-p35-f'>
             <div class="input-group<?php if($isMultiple) echo ' required';?>" id="dataPlanGroup">
-              <?php echo html::select('assignedTo', $members, $isMultiple ? '' : $task->finishedBy, "class='form-control chosen'");?>
+              <?php echo html::select('assignedTo', $isMultiple ? $teamMembers : $members, $isMultiple ? '' : $task->finishedBy, "class='form-control chosen'");?>
               <?php if($isMultiple):?>
               <span class="input-group-btn team-group hidden"><a class="btn br-0" href="#modalTeam" data-toggle="modal"><?php echo $lang->task->team;?></a></span>
               <?php endif;?>