diff --git a/module/task/css/recordworkhour.ui.css b/module/task/css/recordworkhour.ui.css
index 6e39708f4c..8477165b05 100644
--- a/module/task/css/recordworkhour.ui.css
+++ b/module/task/css/recordworkhour.ui.css
@@ -3,4 +3,4 @@
 .panel-form .panel-heading {padding: 1.5rem 0 !important}
 .panel-form .panel-heading .panel-title {font-size: 14px}
 .panel-form .panel-body {padding: 0 0 1rem 0 !important}
-div.alert {margin-bottom: 10px}
+div.alert {margin: 10px 0}
diff --git a/module/task/model.php b/module/task/model.php
index 5ce2a1bcd6..58933cb12f 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1128,6 +1128,8 @@ class taskModel extends model
 
         if(dao::isError()) return false;
 
+        if($currentTeam) $this->dao->update(TABLE_TASKTEAM)->set('left')->eq(0)->set('consumed')->eq($task->consumed)->set('status')->eq('done')->where('id')->eq($currentTeam->id)->exec();
+
         if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $oldTask->id);
         return common::createChanges($oldTask, $task);
     }
diff --git a/module/task/ui/finish.html.php b/module/task/ui/finish.html.php
index a8ea4c3911..b986322e4c 100644
--- a/module/task/ui/finish.html.php
+++ b/module/task/ui/finish.html.php
@@ -60,7 +60,15 @@ else
                 )
             );
 
-        $assignedToControl = formHidden('assignedTo', $assignedTo);
+        $assignedToControl = formGroup
+            (
+                set::width('1/3'),
+                set::label($lang->story->assignTo),
+                set::control('input'),
+                set::disabled(true),
+                set::value(zget($members, $task->nextBy)),
+                formHidden('assignedTo', $task->nextBy)
+            );
     }
     else
     {