diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index c8c8586921..0a49d29468 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -191,9 +191,12 @@ $('#confirmButton').click(function()
     if(memberCount < 2)
     {
         alert(teamMemberError);
+        return false;
     }
-    else
+    if(totalLeft == 0 && (taskStatus == 'doing' || taskStatus == 'pause'))
     {
-        $('.close').click();
+        alert(totalLeftError);
+        return false;
     }
+    $('.close').click();
 });
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 8846d49488..7ccf449406 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -18,10 +18,12 @@
 <?php js::set('oldAssignedTo', $task->assignedTo);?>
 <?php js::set('oldExecutionID', $task->execution);?>
 <?php js::set('oldConsumed', $task->consumed);?>
+<?php js::set('taskStatus', $task->status);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
 <?php js::set('teamMemberError', $lang->task->error->teamMember);?>
+<?php js::set('totalLeftError', sprintf($this->lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]));?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -252,7 +254,7 @@
     <div class="modal fade modal-team" id="modalTeam"  data-scroll-inside='false'>
       <div class="modal-dialog">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">
+          <button type="button" class="close hidden" data-dismiss="modal">
             <i class="icon icon-close"></i>
           </button>
           <h4 class="modal-title"><?php echo $lang->task->team?></h4>