diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php
index 5ba6ea9786..40955646f3 100755
--- a/module/my/view/preference.html.php
+++ b/module/my/view/preference.html.php
@@ -52,7 +52,6 @@ html,body {height: 100%;}
         <th><?php echo $lang->my->productLink;?></th>
         <td><?php echo html::select('productLink', $lang->my->productLinkList, $productLink, "class='form-control chosen'");?></td>
       </tr>
-      <?php if($this->config->systemMode == 'new'):?>
       <tr>
         <th><?php echo $lang->my->projectLink;?></th>
         <td><?php echo html::select('projectLink', $lang->my->projectLinkList, $projectLink, "class='form-control chosen'");?></td>
@@ -61,12 +60,6 @@ html,body {height: 100%;}
         <th><?php echo $lang->my->executionLink;?></th>
         <td><?php echo html::select('executionLink', $lang->my->executionLinkList, $executionLink, "class='form-control chosen'");?></td>
       </tr>
-      <?php else:?>
-      <tr>
-        <th><?php echo $lang->my->executionLink;?></th>
-        <td><?php echo html::select('executionLink', $lang->my->executionLinkList, 'execution-task', "class='form-control chosen'");?></td>
-      </tr>
-      <?php endif;?>
       <tr>
         <td colspan='2' class='text-center form-actions'>
           <?php echo html::submitButton();?>
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index dc49a0a190..08bd440608 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -176,6 +176,7 @@ class upgrade extends control
                 $selectMode = false;
             }
             if(version_compare($openVersion, '18_0', '>=')) $selectMode = false;
+            if(version_compare($openVersion, '15_0', '>=') and $systemMode == 'new') $selectMode = false;
 
             if($selectMode) $this->locate(inlink('to18Guide', "fromVersion=$fromVersion"));