diff --git a/module/task/js/recordestimate.js b/module/task/js/recordestimate.js
index 3938c76b92..1237816baf 100644
--- a/module/task/js/recordestimate.js
+++ b/module/task/js/recordestimate.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    $('.form-date').datetimepicker('setEndDate', '2021-08-27');
+    $('.form-date').datetimepicker('setEndDate', today);
 
     $("#recordForm").submit(function()
     {
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 81c2677f2a..884844530e 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -24,6 +24,7 @@
 <?php $team = array_keys($task->team);?>
 <?php js::set('confirmRecord',    (!empty($team) && $task->assignedTo != end($team)) ? $lang->task->confirmTransfer : $lang->task->confirmRecord);?>
 <?php js::set('noticeSaveRecord', $lang->task->noticeSaveRecord);?>
+<?php js::set('today', helper::today());?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>