diff --git a/module/task/control.php b/module/task/control.php
index 61dfacf410..589f64f30e 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -23,6 +23,14 @@ class task extends control
         $this->loadModel('project');
         $this->loadModel('story');
         $this->loadModel('tree');
+
+        /* Add required fields to waterfall project. */
+        $project = $this->project->getByID($this->session->PRJ);
+        if(!empty($project) && $project->model == 'waterfall')
+        {
+            $this->config->task->create->requiredFields .= ',estStarted,deadline';
+            $this->config->task->edit->requiredFields   .= ',estStarted,deadline';
+        }
     }
 
     /**
diff --git a/module/task/model.php b/module/task/model.php
index 1e34f3a49f..e0e3de90d8 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -28,9 +28,6 @@ class taskModel extends model
             return false;
         }
 
-        $program = $this->loadModel('project')->getByID($this->session->PRJ);
-        if($program->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
-
         $projectID      = (int)$projectID;
         $taskIdList     = array();
         $taskFiles      = array();