diff --git a/module/task/control.php b/module/task/control.php
index bef793c7d4..88419e0d62 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -577,9 +577,14 @@ class task extends control
             unset($_POST['taskIDList']);
             if(!is_array($taskIDList)) die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent'));
             $taskIDList = array_unique($taskIDList);
-            foreach($taskIDList as $taskID)
+
+            $muletipleTasks = $this->dao->select('root')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchPairs();
+            $tasks          = $this->task->getByList($taskIDList);
+            foreach($tasks as $taskID => $task)
             {
                 $this->loadModel('action');
+                if(in_array($taskID, $muletipleTasks) and $task->assignedTo != $this->app->user->account) continue;
+
                 $changes = $this->task->assign($taskID);
                 if(dao::isError()) die(js::error(dao::getError()));
                 $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 8f4aac9f9e..a905387ae7 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -87,6 +87,7 @@
           }
           ?>
           <tr>
+            <?php $disableAssignedTo = (isset($teams[$taskID]) and $tasks[$taskID]->assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?>
             <?php $disableHour = isset($teams[$taskID]) ? "disabled='disabled'" : '';?>
             <td><?php echo $taskID . html::hidden("taskIDList[$taskID]", $taskID);?></td>
             <td style='overflow:visible' title='<?php echo $tasks[$taskID]->name?>'>
@@ -102,7 +103,7 @@
               </div>
             </td>
             <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$taskID]",     $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
-            <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $members, $tasks[$taskID]->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></td>
             <td><?php echo html::select("types[$taskID]",    $typeList, $tasks[$taskID]->type, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'status',     "class='hidden'")?>><?php echo html::select("statuses[$taskID]", $statusList, $tasks[$taskID]->status, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'pri',        "class='hidden'")?>><?php echo html::select("pris[$taskID]",     $priList, $tasks[$taskID]->pri, "class='form-control'");?></td>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 8ad4cfffa7..b01134b9fc 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -121,7 +121,8 @@
               <?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>
+                <?php $disableAssignedTo = (!empty($task->team) and $task->assignedTo != $this->app->user->account) ? "disabled='disabled'" :'';?>
+                <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></span></td>
               </tr>
               <tr class='<?php echo empty($task->team) ? 'hidden' : ''?>' id='teamTr'>
                 <th><?php echo $lang->task->team;?></th>