diff --git a/module/task/model.php b/module/task/model.php
index f60cd711f2..5c4c9b61f3 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3729,7 +3729,8 @@ class taskModel extends model
             $menu .= $this->buildMenu('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'view', 'split', '', '', '', "title='{$this->lang->task->children}'", $this->lang->task->children);
         }
 
-        if(!(!empty($task->team) and $task->mode == 'multi')) $menu .= $this->buildMenu('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $this->lang->task->assignTo : $this->lang->task->transfer);
+        $assignToLang = (!empty($task->team) and $task->mode == 'linear') ? $this->lang->task->transfer : $this->lang->task->assignTo;
+        $menu .= $this->buildMenu('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', $assignToLang);
 
         $menu .= $this->buildMenu('task', 'start',          $params, $task, 'view', '', '', 'iframe showinonlybody', true);
         $menu .= $this->buildMenu('task', 'restart',        $params, $task, 'view', '', '', 'iframe showinonlybody', true);
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 0e4085b0f5..6c855dff64 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -66,7 +66,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
+          <th><?php echo (!empty($task->team) and $task->mode == 'linear') ? $lang->task->transferTo : $lang->task->assign;?></th>
           <td><?php echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");?></td><td></td>
         </tr>
         <tr>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index c4a4d4f31b..a835a17552 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -267,7 +267,7 @@
                   <th><?php echo $lang->task->assignedTo;?></th>
                   <td>
                     <?php
-                    if(!empty($task->team) and $task->mode == 'multi')
+                    if(!empty($task->team) and $task->mode == 'multi' and in_array($task->assignedTo, array_keys($task->team)))
                     {
                         foreach($task->team as $member) echo ' ' . zget($users, $member->account);
                     }