diff --git a/module/custom/control.php b/module/custom/control.php
index 414aecfdfd..025c6d528a 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -594,6 +594,34 @@ class custom extends control
         $this->display();
     }
 
+    /**
+     * Set Mode.
+     * 
+     * @access public
+     * @return void
+     */
+    public function mode()
+    {
+        if($_POST)
+        {
+            $after15mode = fixer::input('post')->get('after15mode');
+            $this->loadModel('setting')->setItem('system.custom.after15mode', $after15mode);
+            if($after15mode == 'new') $this->locate($this->createLink('upgrade', 'mergeTips'));
+        }
+
+        $after15mode = zget($this->config->custom, 'after15mode', 'old');
+        if($after15mode == 'new')
+        {
+            if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') $this->locate($this->createLink('upgrade', 'mergeProgram'));
+
+            unset($_SESSION['upgrading']);
+            $this->locate(inlink('index'));
+        }
+
+        $this->app->loadLang('upgrade');
+        $this->display();
+    }
+
     /**
      * Ajax save custom fields.
      * 
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 6339b67a74..92ee02828e 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -38,6 +38,7 @@ $lang->custom->URStory              = "用户需求";
 $lang->custom->SRStory              = "软件需求";
 $lang->custom->epic                 = "史诗";
 $lang->custom->default              = "默认";
+$lang->custom->mode                 = "模式";
 $lang->custom->scrumStory           = "故事";
 $lang->custom->waterfallCommon      = "瀑布";
 $lang->custom->buildin              = "系统内置";
diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php
index f2644be41e..d6ff2052d6 100644
--- a/module/custom/view/header.html.php
+++ b/module/custom/view/header.html.php
@@ -12,6 +12,10 @@
   {
       common::printLink('custom', $sysObject, "", "<span class='text'>{$lang->custom->$sysObject}</span>", '', "class='btn btn-link' id='{$sysObject}Tab'");
   }
+  if(isset($config->custom->after15mode) and $config->custom->after15mode == 'old')
+  {
+      common::printLink('custom', 'mode', "", "<span class='text'>{$lang->custom->mode}</span>", '', "class='btn btn-link' id='modeTab'");
+  }
   ?>
   </div>
 </div>
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
new file mode 100644
index 0000000000..d9b5cfe816
--- /dev/null
+++ b/module/custom/view/mode.html.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * The set view file of custom module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Tingting Dai <daitingting@xirangit.com>
+ * @package     custom
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include 'header.html.php';?>
+<div id='mainContent' class='main-content'>
+  <form class="load-indicator main-form" method='post'>
+    <div class='main-header'>
+      <div class='heading'>
+        <strong><?php echo $lang->custom->mode?></strong>
+      </div>
+    </div>
+    <table class='table table-form'>
+      <tr>
+        <th class='text-top'><?php echo $lang->custom->mode;?></th>
+        <td>
+          <p><label class="radio-inline"><input type="radio" name="after15mode" value="new" checked='checked' id="after15modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label></p>
+          <p class='text-info'><?php echo $lang->upgrade->selectedModeTips['new'];?></p>
+        </td>
+      </tr>
+      <tr><td></td><td><?php echo html::submitButton()?></td></tr>
+    </table>
+  </form>
+</div>
+<script>
+$('#modeTab').addClass('btn-active-text');
+</script>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 42f57fe697..eab5ff16c6 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -141,7 +141,7 @@ class upgrade extends control
                 || strpos($fromVersion, 'biz') !== false
                 || strpos($fromVersion, 'pro') !== false)
                 && strpos($fromVersion, 'max') === false
-                && !isset($this->config->qcVersion)) $this->locate(inlink('guideTo15', "fromVersion=$fromVersion"));
+                && !isset($this->config->qcVersion)) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion"));
             $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
         }
 
@@ -157,7 +157,7 @@ class upgrade extends control
      * @access public
      * @return void
      */
-    public function guideTo15($fromVersion)
+    public function to15Guide($fromVersion)
     {
         if($_POST)
         {
@@ -168,6 +168,7 @@ class upgrade extends control
             if($after15mode == 'new') $this->locate(inlink('mergeTips'));
         }
 
+        $this->view->title = $this->lang->upgrade->to15Guide;
         $this->display();
     }
 
@@ -469,6 +470,8 @@ class upgrade extends control
         if(empty($repos))
         {
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
+
+            if($this->config->version == $this->config->installedVersion) die(js::locate($this->createLink('custom', 'mode')));
             die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
         }
 
diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php
index 2e77127326..4c0369e48e 100644
--- a/module/upgrade/view/createprogram.html.php
+++ b/module/upgrade/view/createprogram.html.php
@@ -9,7 +9,7 @@
       <div class='input-group'>
         <?php echo html::select("programs", $programs, $programID, "class='form-control hidden pgm-exist' onchange='getProjectByProgram(this)'");?>
         <?php echo html::input("PGMName", isset($programName) ? $programName : '', "class='form-control pgm-no-exist'");?>
-        <?php if(count(programs)):?>
+        <?php if(count($programs)):?>
         <span class='input-group-addon'>
           <div class="checkbox-primary">
             <input type="checkbox" name="newProgram" value="0" checked onchange="toggleProgram(this)" id="newProgram0" />
diff --git a/module/upgrade/view/guideto15.html.php b/module/upgrade/view/to15guide.html.php
similarity index 100%
rename from module/upgrade/view/guideto15.html.php
rename to module/upgrade/view/to15guide.html.php