diff --git a/module/programplan/control.php b/module/programplan/control.php
index fc503a4e7c..f55a7890cf 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -186,6 +186,11 @@ class programplan extends control
         $this->app->loadLang('project');
         $this->app->loadLang('execution');
         $plan = $this->programplan->getByID($planID);
+
+        global $lang;
+        $lang->executionCommon = $lang->execution->stage;
+        include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
+
         if($_POST)
         {
             $changes = $this->programplan->update($planID, $projectID);
diff --git a/module/programplan/model.php b/module/programplan/model.php
index b0a2e30ed7..a8a0cc8345 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -736,6 +736,9 @@ class programplanModel extends model
         if($plan->begin == '0000-00-00') dao::$errors['begin'][] = sprintf($this->lang->error->notempty, $this->lang->programplan->begin);
         if($plan->end   == '0000-00-00') dao::$errors['end'][]   = sprintf($this->lang->error->notempty, $this->lang->programplan->end);
 
+        if($projectID) $this->loadModel('execution')->checkBeginAndEndDate($projectID, $plan->begin, $plan->end);
+        if(dao::isError()) return false;
+
         $planChanged = ($oldPlan->name != $plan->name || $oldPlan->milestone != $plan->milestone || $oldPlan->begin != $plan->begin || $oldPlan->end != $plan->end);
 
         if($plan->parent > 0)