diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index 67c80cbebb..080a8d0581 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -54,7 +54,7 @@ $('#future').on('change', function()
 {
     if($(this).prop('checked'))
     {
-        $('#begin').val('').attr('disabled', 'disabled');
+        $('#begin').attr('disabled', 'disabled');
         $('#end').val('').parents('tr').hide();
     }
     else
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index 3acfaeb631..6b4d8cc604 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -43,11 +43,14 @@ $('#future').on('change', function()
 {
     if($(this).prop('checked'))
     {
-        $('#begin').val('').attr('disabled', 'disabled');
+        $('#begin').attr('disabled', 'disabled');
         $('#end').val('').parents('tr').hide();
     }
     else
     {
+        var begin = $('#begin').val();
+        if(begin == '') $('#begin').val(today);
+
         $('#begin').removeAttr('disabled');
         $('#end').parents('tr').show();
     }
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 9b418f0e35..e8ac1dc53a 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::import($jsRoot . 'misc/date.js');?>
+<?php js::set('today', helper::today());?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>