diff --git a/module/custom/css/mode.css b/module/custom/css/mode.css
index 33693cb3a5..977ae1de8d 100644
--- a/module/custom/css/mode.css
+++ b/module/custom/css/mode.css
@@ -1 +1,2 @@
-#program_chosen {max-width: 170px;}
\ No newline at end of file
+#program_chosen {max-width: 170px;}
+.table-form>tbody>tr>th {width: 130px;}
\ No newline at end of file
diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js
index f5ad1b4fb4..d3b04adbfb 100644
--- a/module/custom/js/mode.js
+++ b/module/custom/js/mode.js
@@ -2,7 +2,19 @@ $(function()
 {
     $('#modeTab').addClass('btn-active-text');
 
-    $('[name=mode]').change(function(){$("#selectDefaultProgram").toggle($(this).val() == 'lean'); });
+    $('[name=mode]').change(function()
+    {
+        if($(this).val() != mode)
+        {
+            $('#submit').removeAttr('disabled');
+        }
+        else
+        {
+            $('#submit').attr('disabled',true);
+        }
+        if(mode == 'lean') return;
+        $("#selectDefaultProgram").toggle($(this).val() == 'lean');
+    });
 
 
     $(document).on('click', '#submit', function()
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 43a1ff02c9..80c682d22d 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
 
 $lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
+$lang->custom->selectDefaultProgram = 'Select the default program';
\ No newline at end of file
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index b6f2b641b3..3845d9e0f9 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
 
 $lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
+$lang->custom->selectDefaultProgram = 'Select the default program';
\ No newline at end of file
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 7297b77d29..87cb7fcd3c 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
 
 $lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set';
+$lang->custom->selectDefaultProgram = 'Select the default program';
\ No newline at end of file
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index a93604106b..776aa2b15d 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -297,3 +297,4 @@ $lang->custom->reviewRules['allpass']  = '全部通过通过';
 $lang->custom->reviewRules['halfpass'] = '半数以上通过通过';
 
 $lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下';
+$lang->custom->selectDefaultProgram = '选择默认项目集';
\ No newline at end of file
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index 5661508113..1d3a4ec228 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -31,19 +31,19 @@
           </p>
         </td>
       </tr>
-      <?php $class = $mode == 'new' ? "class='hide'" : "";?>
-      <tr id="selectDefaultProgram" <?php echo $class;?>>
+      <tr id="selectDefaultProgram" class='hide'>
         <td></td>
         <td>
           <?php
           $disabled = $mode == 'lean' ? "disabled" : '';
           echo html::select('program', $program, $programID, "class='form-control chosen' $disabled" );
           ?>
+          <div class="text-danger help-text"><?php echo $lang->custom->switchModeHelper ?></div>
         </td>
       </tr>
       <tr>
-        <td></td>
-        <td><?php echo html::submitButton($lang->custom->switch);?></td>
+        <th class='text-top'><?php echo $lang->custom->selectDefaultProgram;?></th>
+        <td><?php echo html::submitButton($lang->custom->switch, 'disabled');?></td>
       </tr>
     </table>
   </form>
diff --git a/module/install/control.php b/module/install/control.php
index 9149796c20..91360a7d3d 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -240,7 +240,8 @@ class install extends control
 
             if($this->post->importDemoData) $this->install->importDemoData();
 
-            if($this->config->systemMode == 'lean')
+            $defaultProgram = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
+            if($this->config->systemMode == 'lean' and empty($defaultProgram))
             {
                 /* Lean mode create default program. */
                 $programID = $this->loadModel('program')->createDefaultProgram();
diff --git a/module/install/css/step4.css b/module/install/css/step4.css
index 56221c51cc..40be22c10e 100644
--- a/module/install/css/step4.css
+++ b/module/install/css/step4.css
@@ -12,3 +12,4 @@
 #useNew {background-color: #ddd!important; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
+.container {padding-top: 20px;}
\ No newline at end of file
diff --git a/module/project/control.php b/module/project/control.php
index 7110f5a30f..401df73ed0 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -580,10 +580,14 @@ class project extends control
         {
             $this->lang->project->aclList    = $this->lang->project->kanbanAclList;
             $this->lang->project->subAclList = $this->lang->project->kanbanSubAclList;
-            $this->lang->project->noSprint   = $this->lang->project->kanban;
         }
 
-        if($model == 'scrum')
+        $sprintConcept = empty($this->config->custom->sprintConcept) ?
+        $this->config->executionCommonList[$this->app->getClientLang()][0] :
+        $this->config->executionCommonList[$this->app->getClientLang()][1];
+
+        $this->lang->project->noSprint = sprintf($this->lang->project->noSprint,$sprintConcept);
+        if(common::checkNotCN())
         {
             $this->lang->project->noSprint = empty($this->config->custom->sprintConcept) ?
             $this->config->executionCommonList[$this->app->getClientLang()][0] :
@@ -736,9 +740,12 @@ class project extends control
 
         if($project->model != 'kanban') $canChangeModel = $this->project->checkCanChangeModel($projectID, $project->model);
 
-        if($project->model == 'kanban') $this->lang->project->noSprint = $this->lang->project->kanban;
+        $sprintConcept = empty($this->config->custom->sprintConcept) ?
+        $this->config->executionCommonList[$this->app->getClientLang()][0] :
+        $this->config->executionCommonList[$this->app->getClientLang()][1];
 
-        if($project->model == 'scrum')
+        $this->lang->project->noSprint = sprintf($this->lang->project->noSprint,$sprintConcept);
+        if(common::checkNotCN())
         {
             $this->lang->project->noSprint = empty($this->config->custom->sprintConcept) ?
             $this->config->executionCommonList[$this->app->getClientLang()][0] :
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index d780f9824b..aec231ee9d 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -346,4 +346,4 @@ $lang->project->confirmUnlinkMember  = "您确定从该项目中移除该用户
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
 
-$lang->project->noSprint = '是否启用迭代';
+$lang->project->noSprint = '是否启用%s';
diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css
index 56221c51cc..40be22c10e 100644
--- a/module/upgrade/css/to18guide.css
+++ b/module/upgrade/css/to18guide.css
@@ -12,3 +12,4 @@
 #useNew {background-color: #ddd!important; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
+.container {padding-top: 20px;}
\ No newline at end of file