diff --git a/module/execution/model.php b/module/execution/model.php
index c4a482031a..3680700e54 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -66,8 +66,6 @@ class executionModel extends model
         $execution = $this->getByID($executionID);
         if(!$execution) return;
 
-        if($execution->type == 'stage') unset($this->lang->execution->menu->settings['subMenu']->products);
-
         if($execution and $execution->type == 'kanban')
         {
             global $lang;
@@ -88,6 +86,10 @@ class executionModel extends model
             $this->lang->execution->menu->settings['subMenu']->whitelist = array('link' => "{$this->lang->whitelist}|execution|whitelist|executionID=%s", 'subModule' => 'personnel', 'alias' => 'addwhitelist');
         }
 
+        $project = $this->loadModel('project')->getByID($execution->project);
+
+        if($execution->type == 'stage' or (!empty($project) and $project->model == 'waterfallplus')) unset($this->lang->execution->menu->settings['subMenu']->products);
+
         if(!$this->app->user->admin and strpos(",{$this->app->user->view->sprints},", ",$executionID,") === false and !defined('TUTORIAL') and $executionID != 0) return print(js::error($this->lang->execution->accessDenied) . js::locate('back'));
 
         $executions = $this->getPairs(0, 'all', 'nocode');
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index c6fa24596b..addf01954d 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -143,8 +143,9 @@
           </td>
         </tr>
         <?php endif;?>
-        <?php if(!in_array($execution->attribute, array('request', 'design', 'review'))): ?>
+        <?php if($execution->type != 'stage' or ($execution->type == 'stage' and !in_array($execution->attribute, array('request', 'design', 'review')))): ?>
         <?php $hidden = 'hide'?>
+        <?php $attr   = ($project->model == 'waterfall' or $project->model == 'waterfallplus') ? 'disabled="disabled"' : '';?>
         <?php if(!empty($project->hasProduct)) $hidden = ''?>
         <?php if($linkedProducts):?>
         <?php $i = 0;?>
@@ -160,7 +161,7 @@
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span>
                       <?php $disabled = ($execution->type == 'stage' and !$execution->division) ? "disabled='disabled'" : '';?>
-                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled $attr onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
                       <?php if($execution->type == 'stage' and !$execution->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>
                   </div>
@@ -168,7 +169,7 @@
                     <div class='input-group required'>
                       <span class='input-group-addon fix-border'><?php echo $lang->product->branchName['branch'];?></span>
                       <?php $branchIdList = join(',', $product->branches);?>
-                      <?php echo html::select("branch[$i][]", isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
+                      <?php echo html::select("branch[$i][]", isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' $attr multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
                     </div>
                   </div>
                 </div>
@@ -176,8 +177,8 @@
               <div class="col-sm-6">
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
-                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
-                  <?php if(!($execution->type == 'stage' and !$execution->division)):?>
+                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' $attr multiple");?>
+                  <?php if(!($execution->type == 'stage' and !$execution->division) and $project->model != 'waterfall' and $project->model != 'waterfallplus'):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>