diff --git a/module/program/js/common.js b/module/program/js/common.js
index b12b02cfa1..f34e41c406 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -104,13 +104,8 @@ function computeEndDate(delta)
     if(delta == 999)
     {
         $('#end').val(longTime);
-        $('#end').attr('disabled', 'disabled');
         return false;
     }
-    else
-    {
-        $('#end').removeAttr('disabled');
-    }
 
     beginDate = convertStringToDate(beginDate);
     if((delta == 7 || delta == 14) && (beginDate.getDay() == 1))
diff --git a/module/program/js/edit.js b/module/program/js/edit.js
index d69473ebad..df353f8db3 100644
--- a/module/program/js/edit.js
+++ b/module/program/js/edit.js
@@ -78,4 +78,8 @@ $(function()
         $('#exchangeRate').val(exchangeRate);
         $('#changeUnitTip').modal('hide');
     })
+
+   /* If end is longtime, set the default date to today */
+   var today = $.zui.formatDate(new Date(), 'yyyy-MM-dd');
+   if($('#end').val() == longTime) $('#end').val(today).datetimepicker('update').val(longTime);
 });
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 810baaa9fd..06fe71d320 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -75,9 +75,8 @@
               <?php echo html::input('begin', $program->begin, "class='form-control form-date' placeholder='" . $lang->project->begin . "' required");?>
               <span class='input-group-addon'><?php echo $lang->project->to;?></span>
               <?php
-                $disabledEnd = $program->end == LONG_TIME ? 'disabled' : '';
-                $end         = $program->end == LONG_TIME ? $lang->program->longTime : $program->end;
-                echo html::input('end', $end, "class='form-control form-date' $disabledEnd placeholder='" . $lang->project->end . "' required");
+                $end = $program->end == LONG_TIME ? $lang->program->longTime : $program->end;
+                echo html::input('end', $end, "class='form-control form-date' placeholder='" . $lang->project->end . "' required");
               ?>
             </div>
           </td>