diff --git a/module/task/js/activate.js b/module/task/js/activate.js
index bbaa94f90e..654188a1d5 100644
--- a/module/task/js/activate.js
+++ b/module/task/js/activate.js
@@ -16,7 +16,7 @@ $('#confirmButton').click(function()
 
         var estimate = parseFloat($tr.find('[name^=teamEstimate]').val());
         if(!isNaN(estimate)) totalEstimate += estimate;
-        if(isNaN(estimate) || estimate == 0)
+        if($tr.hasClass('member-wait') && (isNaN(estimate) || estimate == 0))
         {
               bootbox.alert(account + ' ' + estimateNotEmpty);
               error = true;
@@ -29,20 +29,12 @@ $('#confirmButton').click(function()
         var $left = $tr.find('[name^=teamLeft]');
         var left  = parseFloat($left.val());
         if(!isNaN(left)) totalLeft += left;
-        if(!$left.prop('readonly') && (isNaN(left) || left == 0))
+        if(!$left.prop('readonly') && $tr.hasClass('member-wait') && (isNaN(left) || left == 0))
         {
               bootbox.alert(account + ' ' + leftNotEmpty);
               error = true;
               return false;
         }
-
-        if(estimate == 0 || isNaN(estimate))
-        {
-            $(this).val('').trigger("chosen:updated");
-            bootbox.alert(estimateNotEmpty);
-            error = true;
-            return false;
-        }
     })
 
     if(error) return false;
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index a16df3a68c..68de34a217 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -257,7 +257,7 @@ $lang->task->error->consumedSmall     = '"总计消耗"必须大于之前消耗'
 $lang->task->error->consumedThisTime  = '请填写"消耗"';
 $lang->task->error->left              = '请填写"剩余"';
 $lang->task->error->work              = '"备注"必须小于%d个字符';
-$lang->task->error->teamMember        = '团队成员必须不少于2人';
+$lang->task->error->teamMember        = '团队成员必须大于1人';
 $lang->task->error->skipClose         = '任务：%s 不是“已完成”或“已取消”状态，确定要关闭吗？';
 $lang->task->error->closeParent       = '任务：%s 是父任务，父任务在所有子任务关闭后会自动关闭，无法手动关闭。';
 $lang->task->error->consumed          = '任务：%s工时不能小于0，忽略该任务工时的改动';