diff --git a/module/project/model.php b/module/project/model.php
index e7aeb6beb8..4e07d53447 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1535,6 +1535,7 @@ class projectModel extends model
         $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
         $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec();
 
+        $projectMember = array();
         foreach($accounts as $key => $account)
         {
             if(empty($account)) continue;
@@ -1549,12 +1550,6 @@ class projectModel extends model
                 dao::$errors['message'][]  = $this->lang->project->errorHours;
                 return false;
             }
-        }
-
-        $projectMember = array();
-        foreach($accounts as $key => $account)
-        {
-            if(empty($account)) continue;
 
             $member          = new stdclass();
             $member->role    = $roles[$key];
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 931c116e69..2cb1c3cc66 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -89,8 +89,8 @@
           </td>
           <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
         </tr>
-        <?php if($model == 'scrum'):?>
-        <tr id='daysBox'>
+        <?php $hiddenDays = $model == 'scrum' ? '' : 'hidden';?>
+        <tr id='daysBox' class="<?php echo $hiddenDays;?>">
           <th><?php echo $lang->execution->days;?></th>
           <td>
             <div class='input-group'>
@@ -99,7 +99,6 @@
             </div>
           </td><td></td><td></td>
         </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo $lang->project->manageProducts;?></th>
           <td class='text-left' id='productsBox' colspan="3">
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 5827c14d6f..460a2b7bef 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -102,8 +102,8 @@
           <?php $deltaValue = $project->end == LONG_TIME ? 999 : (strtotime($project->end) - strtotime($project->begin)) / 3600 / 24 + 1;?>
           <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?></td>
         </tr>
-        <?php if($project->model == 'scrum'):?>
-        <tr id='daysBox' <?php if($project->end == LONG_TIME) echo "class='hidden'";?>>
+        <?php $hidden = ($model != 'scrum' or $project->end == LONG_TIME) ? "class='hidden'" : '';?>
+        <tr id='daysBox' <?php echo $hidden;?>>
           <th><?php echo $lang->project->days;?></th>
           <td>
             <div class='input-group'>
@@ -114,7 +114,6 @@
           <td></td>
           <td></td>
         </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo $lang->project->manageProducts;?></th>
           <td class='text-left' id='productsBox' colspan="3">