diff --git a/module/task/model.php b/module/task/model.php
index 9d442270d6..a96d838727 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1053,7 +1053,7 @@ class taskModel extends model
                 $earliestTime = $record->dates[$id];
             }
 
-            if($record->dates[$id])
+            if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
             {
                 if(!$record->consumed[$id])   die(js::alert($this->lang->task->error->consumedThisTime));
                 if($record->left[$id] === '') die(js::alert($this->lang->task->error->left));
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index ec2db89ed9..7161b6d29c 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -85,7 +85,7 @@
           <?php for($i = 1; $i <= 3; $i++):?>
           <tr class="text-center">
             <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
-            <td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
+            <td><?php echo html::input("dates[$i]", helper::today(), "class='form-control text-center form-date'");?></td>
             <td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
             <td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
             <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>