diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index a48f0bfbc9..c386ff7b99 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -34,7 +34,11 @@
       <?php $class = $mode == 'new' ? "class='hide'" : "";?>
       <tr id="selectDefaultProgram" <?php echo $class;?>>
         <td></td>
-        <td><?php echo html::select('program', $program, $programID, "class='form-control chosen'");?></td>
+        <td>
+        <?php
+        $disabled = $mode == 'lean' ? "disabled" : '';
+        echo html::select('program', $program, $programID, "class='form-control chosen' $disabled" );?>
+        </td>
       </tr>
       <tr>
         <td></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 2565427d8f..561217406e 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -73,11 +73,15 @@
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td>
         </tr>
         <?php endif;?>
-        <?php if($model == 'scrum' or $model == 'kanban'):?>
+        <?php if(!isset($this->config->projectMode) and $model != 'waterfall'):?>
         <tr>
           <th><?php echo $lang->project->noSprint;?></th>
           <td colspan='3'><?php echo nl2br(html::radio('noSprint', $lang->project->noSprintList, 0));?></td>
         </tr>
+        <?php elseif($model == 'waterfall'):?>
+        <?php echo html::hidden('noSprint', 0);?>
+        <?php else:?>
+        <?php echo html::hidden('noSprint', 1);?>
         <?php endif;?>
         <tr>
           <th><?php echo $lang->project->PM;?></th>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index d9387e10bd..17d356fa9a 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -77,11 +77,15 @@
           <td><?php echo html::input('code', $project->code, "class='form-control' required");?></td>
         </tr>
         <?php endif;?>
-        <?php if($model == 'scrum' or $model == 'kanban'): ?>
+        <?php if(!isset($this->config->projectMode) and $model != 'waterfall'):?>
         <tr>
           <th><?php echo $lang->project->noSprint;?></th>
           <td colspan='3'><?php echo nl2br(html::radio('noSprint', $lang->project->noSprintList, $project->noSprint, 'disabled'));?></td>
         </tr>
+        <?php elseif($model == 'waterfall'):?>
+        <?php echo html::hidden('noSprint', 0);?>
+        <?php else:?>
+        <?php echo html::hidden('noSprint', 1);?>
         <?php endif;?>
         <tr>
           <th><?php echo $lang->project->PM;?></th>