diff --git a/module/task/model.php b/module/task/model.php
index 5880c89ec6..2431fe8286 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -506,7 +506,7 @@ class taskModel extends model
             ->setDefault('task', $taskID) 
             ->setDefault('date', date(DT_DATE1)) 
             ->setDefault('left', 0)
-            ->remove('finishedDate,comment')->get();
+            ->remove('finishedDate,comment,assignedTo')->get();
         $estimate->consumed = $estimate->consumed - $oldTask->consumed; 
         if($estimate->consumed) $this->addTaskEstimate($estimate);
 
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 8b3eb45e2b..fa2413e8ae 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -18,6 +18,10 @@
       <th class='rowhead'><?php echo $lang->task->consumed;?></th>
       <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
     </tr>
+    <tr>
+      <td class='rowhead'><?php echo $lang->task->assignedTo;?></td>
+      <td><?php echo html::select('assignedTo', $users, $task->openedBy, "class='select-3'");?></td>
+    </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->task->finishedDate;?></td>
       <td><?php echo html::input('finishedDate',$date, "class='text-3'");?></td>