diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 816384f29..4a8d02e58 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -152,7 +152,7 @@
                             <select class="form-control select <?=(count($campaign->setup_products['provision']) < 2) ? "hidden" : "" ?>" onchange="updateSetupProduct('provision')">
                               <option value="0"></option>
                               <?php foreach($campaign->setup_products['provision'] as $sp): ?>
-                              <option data-price="<?=$sp->price_setup?>" value="<?=$sp->id?>" <?=($sp->product_id == $sp->id) ? "selected='selected'" : ""?>><?=$sp->name?></option>
+                              <option data-price="<?=$sp->price_setup?>" value="<?=$sp->id?>" <?=($preorder->setup_product_id == $sp->id) ? "selected='selected'" : ""?>><?=$sp->name?></option>
                               <?php endforeach; ?>
                             </select>
                           </div>
@@ -169,7 +169,7 @@
                             <select class="form-control select <?=(count($campaign->setup_products['activation']) < 2) ? "hidden" : "" ?>" onchange="updateSetupProduct('activation')">
                               <option value="0"></option>
                               <?php foreach($campaign->setup_products['activation'] as $sp): ?>
-                              <option data-price="<?=$sp->price_setup?>" value="<?=$sp->id?>" <?=($sp->product_id == $sp->id) ? "selected='selected'" : ""?>><?=$sp->name?></option>
+                              <option data-price="<?=$sp->price_setup?>" value="<?=$sp->id?>" <?=($preorder->setup_product_id == $sp->id) ? "selected='selected'" : ""?>><?=$sp->name?></option>
                               <?php endforeach; ?>
                             </select>
                           </div>
@@ -324,14 +324,23 @@
     <?php if($preorder->type != "order"): ?>
       $('#setup-activation').hide();
     <?php endif; ?>
-      
+    
+    
     if($('#type').val() == "provision") {
       $('#setup-provision').show();
+      if(!$("#price_setup").val()) {
+        $("#price_setup").val($("#setup-provision input.value").data("price"));
+      }
     }
     
     if($('#type').val() == "order") {
       $('#setup-activation').show();
+      if(!$("#price_setup").val()) {
+        $("#price_setup").val($("#setup-provision input.value").data("price"));
+      }
     }
+  
+    
     
     $("#product_id").select2({
       allowClear: true,
@@ -422,7 +431,7 @@
         $("#setup-provision select").val("0");
       }
     });
-
+    
   });
 
   function updateSetupProduct(type) {