diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 0d0ab1a66..2abde69dd 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -138,25 +138,46 @@
                       </div>
                     </div>
                     
+                    <input type="hidden" name="setup_product_id" id="setup_product_id" value="<?=$preorder->setup_product_id?>" />
+                    
                     <?php if(is_array($campaign->setup_products) && count($campaign->setup_products)): ?>
-                    <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="setup_product_id">Anschlussprodukt (Herstellung) *</label>
-                      <div class="col-lg-10">
-                        <input type="hidden" name="setup_product_id" value="<?=$preorder->setup_product_id?>" />
-                        <input type="text" id="setup_product_id_text" class="form-control <?=(count($campaign->setup_products) == 1) ? "hidden" : "" ?>" value="<?=(count($campaign->setup_products)) ? $campaign->setup_products[0]->name : ""?>" readonly="readonly" />
-                        
-                        <select class="form-control <?=(count($setup_products) < 2) ? "hidden" : "" ?>" id="setup_product_id_select" onchange="updateSetupProduct()">
-                          <option value=""></option>
-                          <?php foreach($setup_products as $sp): ?>
-                          <option value="<?=$sp->id?>" <?=($sp->product_id == $sp->id) ? "selected='selected'" : ""?>><?=$sp->name?></option>
-                          <?php endforeach; ?>
-                        </select>
-                      </div>
-                    </div>
+                      <?php if(is_array($campaign->setup_products['provision']) && count($campaign->setup_products['provision'])): ?>
+                        <div class="form-group row" id="setup-provision">
+                          <label class="col-lg-2 col-form-label" for="">Anschlussprodukt (Herstellung) *</label>
+                          <div class="col-lg-10">
+                            <input type="hidden" class="form-control value <?=(count($campaign->setup_products['provision']) == 1) ? "" : "hidden" ?>" data-price="<?=$campaign->setup_products['provision'][0]->price_setup?>" value="<?=(count($campaign->setup_products['provision']) == 1) ? $campaign->setup_products['provision'][0]->id : ""?>" readonly="readonly" />
+                            <input type="text" class="form-control text <?=(count($campaign->setup_products['provision']) == 1) ? "" : "hidden" ?>" value="<?=(count($campaign->setup_products['provision'])) ? $campaign->setup_products['provision'][0]->name : ""?>" readonly="readonly" />
+
+                            <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>
+                              <?php endforeach; ?>
+                            </select>
+                          </div>
+                        </div>
+                      <?php endif; ?>
+                      
+                      <?php if(is_array($campaign->setup_products['activation']) && count($campaign->setup_products['activation'])): ?>
+                        <div class="form-group row" id="setup-activation">
+                          <label class="col-lg-2 col-form-label" for="">Anschlussprodukt (Herstellung) *</label>
+                          <div class="col-lg-10">
+                            <input type="hidden" class="form-control value <?=(count($campaign->setup_products['activation']) == 1) ? "" : "hidden" ?>" data-price="<?=$campaign->setup_products['activation'][0]?>" value="<?=(count($campaign->setup_products['activation']) == 1) ? $campaign->setup_products['activation'][0]->id : ""?>" readonly="readonly" />
+                            <input type="text" class="form-control text <?=(count($campaign->setup_products['activation']) == 1) ? "" : "hidden" ?>" value="<?=(count($campaign->setup_products['activation'])) ? $campaign->setup_products['activation'][0]->name : ""?>" readonly="readonly" />
+
+                            <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>
+                              <?php endforeach; ?>
+                            </select>
+                          </div>
+                        </div>
+                      <?php endif; ?>
                     <?php endif; ?>
                     
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="product_id">Produkt *</label>
+                      <label class="col-lg-2 col-form-label" for="product_id">Internetprodukt *</label>
                       <div class="col-lg-10">
                         <select class="form-control" name="product_id" id="product_id" onchange="updateProduct()">
                           <option value=""></option>
@@ -296,6 +317,13 @@
       $('#building-search-selected').hide();
     <?php endif; ?>
     
+    <?php if($preorder->type != "provision"): ?>
+      $('#setup-provision').hide();
+    <?php endif; ?>
+    <?php if($preorder->type != "order"): ?>
+      $('#setup-activation').hide();
+    <?php endif; ?>
+      
     $("#product_id").select2({
       allowClear: true,
       placeholder: ""
@@ -348,9 +376,55 @@
         return false;
       }
     });
+    
+    $('#type').change(function() {
+      var type = $('#type').val();
+      var pid = 0;
+      var price = 0;
+      
+      if(type == "interest") {
+        $('#setup-provision').hide();
+        $('#setup-activation').hide();
+        $('#setup_product_id').val("");
+      } else if(type == "provision") {
+        $('#setup-provision').show();
+        $('#setup-activation').hide();
+        $('#setup_product_id').val("");
+        if($("#setup-provision input.value").val()) {
+          pid = $("#setup-provision input.value").val();
+          price = $("#setup-provision input.value").data("price");
+          $("#setup_product_id").val(pid);
+          $("#price_setup").val(price);
+        }
+        $("#setup-activation select").val("0");
+      } else if(type == "order") {
+        $('#setup-provision').hide();
+        $('#setup-activation').show();
+        $('#setup_product_id').val("");
+        if($("#setup-activation input.value").val()) {
+          pid = $("#setup-activation input.value").val();
+          price = $("#setup-activation input.value").data("price");
+          $("#setup_product_id").val(pid);
+          $("#price_setup").val(price);
+        }
+        $("#setup-provision select").val("0");
+      }
+    });
 
   });
-  
+
+  function updateSetupProduct(type) {
+    if(type == "provision") {
+      $('#setup_product_id').val($("#setup-provision select").val());
+      var price = $("#setup-provision select option:selected").data("price");
+      $("#price_setup").val(price);
+    } else if(type == "activation") {
+      $('#setup_product_id').val($("#setup-activation select").val());
+      var price = $("#setup-activation select option:selected").data("price");
+      $("#price_setup").val(price);
+    }
+  }
+
   function listSearchresults(data) {
     resetSearchresults();
     var count = data.buildings.length;
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 272518daa..abc575d14 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -36,7 +36,7 @@
                 <th>Typ</th>
                 <th>Kunde</th>
                 <th>Adresse</th>
-                <th>Partner ID</th>
+                <th>Partner</th>
                 <th>Anschluss</th>
                 <th>Erstellt</th>
                 <th>Zuletzt bearbeitet</th>
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 4b34a2691..451b44ff0 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -10,7 +10,7 @@ class Preorder extends mfBaseModel {
     if($this->$name == null) {
       
       if($name == "campaign") {
-        $this->campaign = new Preordercampaign($this->id);
+        $this->campaign = new Preordercampaign($this->preordercampaign_id);
         return $this->campaign;
       }
       
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 62a21db99..03fdf2d6d 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -45,7 +45,7 @@ class PreorderController extends mfBaseController {
     if($filter['campaign_id']) {
       $campaign_id = $filter['campaign_id'];
       if(is_numeric($campaign_id) && $campaign_id > 0) {
-        $campaign = new Preordercampaign($campaign);
+        $campaign = new Preordercampaign($campaign_id);
         $this->layout()->set("campaign", $campaign);
       }
       
@@ -54,8 +54,6 @@ class PreorderController extends mfBaseController {
     //var_dump($campaign_filter);exit;
     $preorders = PreorderModel::search($campaign_filter);
     $this->layout()->set("preorders", $preorders);
-    
-    
   }
   
   private function getPreparedFilter($filter) {
@@ -149,6 +147,7 @@ class PreorderController extends mfBaseController {
     $data['building_id'] = $r->building_id;
     $data['termination_id'] = ($r->termination_id) ? $r->termination_id : null;
     $data['product_id'] = $r->product_id;
+    $data['setup_product_id'] = $r->setup_product_id;
     
     switch($r->type) {
       case "interest":
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 1308e3f95..08bb9a8b5 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -5,6 +5,7 @@ class PreorderModel {
   public $building_id;
   public $termination_id;
   public $product_id;
+  public $setup_product_id;
   public $type;
   public $order_id;
   public $price;
diff --git a/application/Preordercampaign/Preordercampaign.php b/application/Preordercampaign/Preordercampaign.php
index c4afa0130..6c1babfa8 100644
--- a/application/Preordercampaign/Preordercampaign.php
+++ b/application/Preordercampaign/Preordercampaign.php
@@ -42,6 +42,13 @@ class Preordercampaign extends mfBaseModel {
 
   }
   
+  public function getSetupProducts() {
+    $provisions = ProductModel::search(["attributename" => "presales", "attributevalue" => "provision"]);
+    $activations = ProductModel::search(["attributename" => "presales", "attributevalue" => "activation"]);
+    
+    return ['activation' => $activations, 'provision' => $provisions];
+  }
+  
   public function getProperty($name) {
     if($this->$name == null) {
       
@@ -58,8 +65,10 @@ class Preordercampaign extends mfBaseModel {
         return $this->types;
       }
       
-      if($name == "setup_products_provision") {
-        $products = ProductModel::search(["attributename" => "presales", "attributevalue" => "provision"]);
+      if($name == "setup_products") {
+        $this->setup_products = $this->getSetupProducts();
+        //var_dump($this->setup_products);exit;
+        return $this->setup_products;
       }
       
       if($name == "creator") {
diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php
index 9999567e8..0a54eb135 100644
--- a/application/Product/ProductModel.php
+++ b/application/Product/ProductModel.php
@@ -105,7 +105,8 @@ class ProductModel {
       WHERE $where
       GROUP BY Product.id";
     
-    $res = $db->select("Product", "*", "$where ORDER BY name, producttech_id");
+    $res = $db->query($sql);
+    //$res = $db->select("Product", "*", "$where ORDER BY name, producttech_id");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Product($data);
@@ -151,7 +152,7 @@ class ProductModel {
     if(array_key_exists("attributename", $filter)) {
       $attributename = $db->escape($filter['attributename']);
       if($attributename) {
-        $where .= " AND ProductAttribute.name = '$attributename'";
+        $where .= " AND ProducttechAttribute.name = '$attributename'";
       }
     }