diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 7eccaad7b6..f325685110 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -481,7 +481,7 @@ class upgrade extends control
     public function ajaxGetProjectPairsByProgram($programID = 0)
     {
         $projects = array('' => '') + $this->upgrade->getProjectPairsByProgram($programID);
-        die(html::select('projects', $projects, '', 'class="form-control"'));
+        die(html::select('projects', $projects, '', 'class="form-control prj-exist"'));
     }
 
     /**
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 74635a1cab..99afcd4b66 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -119,6 +119,7 @@ function getProjectByProgram(obj)
         if($('#newProject0').is(':checked'))
         {
             $('#projects').attr('disabled', 'disabled');
+            $('#projects').addClass('hidden');
         }
     })
 }
@@ -128,24 +129,21 @@ function toggleProgram(obj)
     var $obj       = $(obj);
     if($obj.length == 0) return false;
 
-    var $programs  = $obj.closest('table').find('#programs');
-    var $PGMParams = $obj.closest('table').find('.PGMParams');
+    var $programs = $obj.closest('table').find('#programs');
     if($obj.prop('checked'))
     {
+        $('form .pgm-no-exist').removeClass('hidden');
+        $('form .pgm-exist').addClass('hidden');
+        $programs.attr('disabled', 'disabled');
+
         $('form #newProject0').prop('checked', true);
         toggleProject($('form #newProject0'));
-
-        $('#PGMName').closest('tr').show();
-        $programs.attr('disabled', 'disabled');
-        $PGMParams.removeClass('hidden');
     }
     else
     {
-        $('#PGMName').closest('tr').hide();
+        $('form .pgm-exist').removeClass('hidden');
+        $('form .pgm-no-exist').addClass('hidden');
         $programs.removeAttr('disabled');
-        $PGMParams.addClass('hidden');
-
-        toggleProject($('form #newProject0'));
     }
 }
 
@@ -155,20 +153,26 @@ function toggleProject(obj)
     if($obj.length == 0) return false;
 
     var $projects  = $obj.closest('table').find('#projects');
+    var $programs  = $obj.closest('table').find('#programs');
     var $PGMParams = $obj.closest('table').find('.PGMParams');
     if($obj.prop('checked'))
     {
-        $projects.attr('disabled', 'disabled');
+        $('form .prj-no-exist').removeClass('hidden');
+        $('form .prj-exist').addClass('hidden');
         $PGMParams.removeClass('hidden');
-        if(!$('form #newProgram0').prop('checked')) $('#PGMName').closest('tr').hide();
+        $projects.attr('disabled', 'disabled');
     }
     else
     {
-        $projects.removeAttr('disabled');
+        $('form .prj-exist').removeClass('hidden');
+        $('form .prj-no-exist').addClass('hidden');
         $PGMParams.addClass('hidden');
+        $projects.removeAttr('disabled');
 
         $('form #newProgram0').prop('checked', false);
-        $('#programs').removeAttr('disabled');
+        toggleProgram($('form #newProgram0'));
+
+        getProjectByProgram(programs);
     }
 }
 
diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php
index 03cf6c8248..a723103cf1 100644
--- a/module/upgrade/view/createprogram.html.php
+++ b/module/upgrade/view/createprogram.html.php
@@ -1,45 +1,45 @@
 <table class='table table-form'>
   <caption class='strong'><?php echo $lang->upgrade->program;?></caption>
-  <?php if($programs):?>
   <tr>
-    <th><?php echo $lang->upgrade->existPGM;?></th>
+    <th>
+      <span class="pgm-exist hidden"><?php echo $lang->upgrade->existPGM;?></span>
+      <span class="pgm-no-exist"><?php echo $lang->program->PGMName;?></span></th>
+    </th>
     <td class='required'>
       <div class='input-group'>
-        <?php echo html::select("programs", $programs, $programID, "class='form-control' onchange='getProjectByProgram(this)'");?>
+        <?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)):?>
         <span class='input-group-addon'>
           <div class="checkbox-primary">
             <input type="checkbox" name="newProgram" value="0" checked onchange="toggleProgram(this)" id="newProgram0" />
             <label for="newProgram0"><?php echo $lang->upgrade->newProgram;?></label>
           </div>
         </span>
+        <?php endif;?>
       </div>
     </td>
   </tr>
-  <?php endif;?>
-  <?php if(count($projects) > 1):?>
   <tr>
-    <th><?php echo $lang->upgrade->existPRJ;?></th>
+    <th>
+      <span class="prj-exist hidden"><?php echo $lang->upgrade->existPRJ;?></span>
+      <span class="prj-no-exist"><?php echo $lang->program->PRJName;?></span></th>
+</th>
     <td class='required'>
       <div class='input-group'>
-        <?php echo html::select("projects", $projects, '', "class='form-control'");?>
+        <?php echo html::select("projects", $projects, '', "class='form-control hidden prj-exist'");?>
+        <?php echo html::input("PRJName", isset($sprintName) ? $sprintName : '', "class='form-control prj-no-exist'");?>
+        <?php if(count($projects)):?>
         <span class='input-group-addon'>
           <div class="checkbox-primary">
             <input type="checkbox" name="newProject" value="0" checked onchange="toggleProject(this)" id="newProject0" />
             <label for="newProject0"><?php echo $lang->upgrade->newProgram;?></label>
           </div>
         </span>
+        <?php endif;?>
       </div>
     </td>
   </tr>
-  <?php endif;?>
-  <tr class='PGMParams'>
-    <th class='w-90px'><?php echo $lang->program->PGMName;?></th>
-    <td class='required'><?php echo html::input("PGMName", isset($programName) ? $programName : '', "class='form-control'");?></td>
-  </tr>
-  <tr class='PGMParams'>
-    <th><?php echo $lang->program->PRJName;?></th>
-    <td class='required'><?php echo html::input("PRJName", isset($sprintName) ? $sprintName : '', "class='form-control'");?></td>
-  </tr>
   <tr class='PGMParams'>
     <th><?php echo $lang->program->PRJPM;?></th>
     <td><?php echo html::select('PM', array('' => '') + $users, '', "class='form-control chosen'");?></td>