diff --git a/module/project/js/create.js b/module/project/js/create.js
index 347a0406c7..8931eac1b6 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -400,6 +400,7 @@ function removeLine(obj)
 {
     $(obj).closest('tr').remove();
     disableSelectedProduct();
+    if($("select[name^='products']").length < 2) $('.division').addClass('hide'); 
 }
 
 /**
diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index d9abb1e438..c1353908a1 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -293,4 +293,6 @@ function addNewLine(obj)
 function removeLine(obj)
 {
     $(obj).closest('tr').remove();
+    disableSelectedProduct();
+    if($("select[name^='products']").length < 2) $('.division').addClass('hide'); 
 }
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 111d1e2a6c..54763f1ee8 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -132,7 +132,25 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
               <?php endif;?>
               <tr class="modeBox">
                 <th><?php echo $lang->task->mode;?></th>
-                <td><?php echo $task->status == 'wait' ? html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'") : zget($lang->task->editModeList, $task->mode);?></td>
+                <td>
+                  <?php
+                  if($task->status == 'wait')
+                  {
+                      echo html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'");
+                  }
+                  else
+                  {
+                      if($task->mode == '')
+                      {
+                          echo $lang->task->editModeList['single'];
+                      }
+                      else
+                      {
+                          echo zget($lang->task->editModeList, $task->mode);
+                      }
+                  }
+                  ?>
+                </td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>