diff --git a/module/task/control.php b/module/task/control.php
index 092e265f61..d3353d1c7a 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1175,7 +1175,12 @@ class task extends control
             /* Update assign of multi task. */
             $postData = form::data($this->config->task->form->manageTeam);
             $task     = $this->taskZen->prepareManageTeam($postData, $taskID);
-            $changes  = $this->task->updateTeam($task, $postData);
+
+            $postData->team         = $this->post->team;
+            $postData->teamEstimate = $this->post->teamEstimate;
+            $postData->teamConsumed = $this->post->teamConsumed;
+            $postData->teamLeft     = $this->post->teamLeft;
+            $changes = $this->task->updateTeam($task, $postData);
 
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
diff --git a/module/task/model.php b/module/task/model.php
index 82b5f928a4..769dadee65 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2261,9 +2261,9 @@ class taskModel extends model
             $member->task     = $task->id;
             $member->order    = $index;
             $member->account  = $account;
-            $member->estimate = zget($teamData->teamEstimate, $index, 0);
-            $member->consumed = isset($teamData->teamConsumed) ? zget($teamData->teamConsumed, $index, 0) : 0;
-            $member->left     = isset($teamData->teamLeft) ? zget($teamData->teamLeft, $index, 0) : 0;
+            $member->estimate = isset($teamData->teamEstimate) ? (float)zget($teamData->teamEstimate, $index, 0.00) : 0.00;
+            $member->consumed = isset($teamData->teamConsumed) ? (float)zget($teamData->teamConsumed, $index, 0.00) : 0.00;
+            $member->left     = isset($teamData->teamLeft) ? (float)zget($teamData->teamLeft, $index, 0.00) : 0.00;
             $member->status   = 'wait';
             if($task->status == 'wait' && $member->estimate > 0 && $member->left == 0) $member->left = $member->estimate;
             if($task->status == 'done') $member->left = 0;
@@ -3141,7 +3141,8 @@ class taskModel extends model
             ->where('id')->eq($taskID)
             ->exec();
 
-        if(!dao::isError()) return common::createChanges($oldTask, $task);
+        if(dao::isError()) return false;
+        return common::createChanges($oldTask, $task);
     }
 
     /**
diff --git a/module/task/ui/manageteam.html.php b/module/task/ui/manageteam.html.php
index c578a79ac3..84f5f47c90 100644
--- a/module/task/ui/manageteam.html.php
+++ b/module/task/ui/manageteam.html.php
@@ -50,6 +50,7 @@ else
             setID('teamTable'),
             setClass('table table-form'),
             formHidden('mode', $task->mode),
+            formHidden('status', $task->status),
             $teamForm
         )
     );
diff --git a/module/task/ui/taskteam.html.php b/module/task/ui/taskteam.html.php
index 085a39b56f..ee15e26028 100644
--- a/module/task/ui/taskteam.html.php
+++ b/module/task/ui/taskteam.html.php
@@ -140,6 +140,7 @@ for($i; $i < $count; $i ++)
 {
     $teamForm[] = h::tr
     (
+        setClass('member-wait'),
         h::td
         (
             setClass('team-index'),