diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 8196b4633..ed1736ac2 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -48,7 +48,7 @@
                   <div id="building-search">
                   
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="building_units">Gebäude suchen *</label>
+                      <label class="col-lg-2 col-form-label" for="building_id_search">Gebäude suchen *</label>
                       <div class="col-lg-10">
                         <input type="text" class="form-control" name="building_id_search" id="building_id_search" />
                       </div>
@@ -59,12 +59,13 @@
                       <label class="col-lg-2 col-form-label" for="building_units">Gebäude auswählen *</label>
                       <div class="col-lg-10">
                         <a href="#" class="text-success" onclick="refreshBuildingSearch()"><i class="fas fa-refresh"></i> Aktualisieren</a>
-                        <table class="table table-striped table-hover mb-0" id="building-search-results">
+                        <table class="table table-sm table-striped table-hover mb-0" id="building-search-results">
                           <tr>
                             <th></th>
                             <th>Straße</th>
                             <th>PLZ</th>
                             <th>Ort</th>
+                            <th>Wohneinheiten</th>
                             <th>Code</th>
                             <th>OAN ID</th>
                           </tr>
@@ -75,48 +76,158 @@
                     </div>
                     
                     <div class="form-group row" id="building-search-selected">
+                      <input type="hidden" name="building_id" value="<?=$preorder->building_id?>" ?>
                       <label class="col-lg-2 col-form-label" for="">Ausgewähltes Gebäude</label>
                       <div class="col-lg-10">
-                        <table>
-                          <tr>
-                            <td class="check-mark align-top" style="font-size: 2.5em; width:40px;"><i class="fas fa-question text-warning"></i></td>
-                            <td class="label">Bitte auswählen...</td>
-                          </tr>
-                        </table>
-                        
+                        <div class="card">
+                          <div class="card-body">
+                            <?php if($preorder->id): ?>
+                            <table>
+                              <tr>
+                                <td class="check-mark align-top" style="font-size: 2.5em; width:40px;"><i class="fas fa-question text-warning"></i></td>
+                                <td class="label">Bitte auswählen...</td>
+                              </tr>
+                            </table>
+                            <?php else: ?>
+                            <table>
+                              <tr>
+                                <td class="check-mark align-top" style="font-size: 2.5em; width:40px;"><i class="fas fa-check text-success"></i></td>
+                                <td class="label">
+                                  <?=$preorder->street?><br />
+                                  <?=$preorder->zip?> <?=$preorder->city?><br />
+                                  Wohneinheiten: <?=($preorder->units) ? $preorder->units : 1?>
+                                  <?php if($preorder->building->code): ?>
+                                  <br /><?=$preorder->building->code?>
+                                  <?php endif; ?>
+                                  <?php if($preorder->building->oan_id): ?>
+                                  <br /><?=$preorder->building->oan_id?>
+                                  <?php endif; ?>
+                                </td>
+                              </tr>
+                            </table>
+                            <?php endif; ?>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   
                   </div>
                   
-                  <div id="preorder-form">
-                    <h4>Vorbestellung</h4>
+                  <div id="preorder-form" class="mt-4">
+                    <h4>Vorbestellung & Produkt</h4>
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="building_units">Vorbestelltyp *</label>
+                      <label class="col-lg-2 col-form-label" for="type">Vorbestelltyp *</label>
                       <div class="col-lg-10">
                         <select class="form-control" name="type" id="type">
-                          <option value="interest">Interessensbekundung</option>
-                          <option value="preorder">Vorsorgeanschluss</option>
-                          <option value="order">Vollanschluss</option>
+                          <option value="interest" <?=($preorder->type == "interest") ? "selected='selected'" : ""?>>Interessensbekundung</option>
+                          <option value="provision" <?=($preorder->type == "provision") ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
+                          <option value="order" <?=($preorder->type == "order") ? "selected='selected'" : ""?>>Vollanschluss</option>
                         </select>
                       </div>
                     </div>
                     
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="building_units">Preis Netto *</label>
+                      <label class="col-lg-2 col-form-label" for="product_id">Produkt</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="building_id_search" id="building_id_search" />
+                        <select class="form-control" name="product_id" id="product_id" onchange="updateProduct()">
+                          <option value=""></option>
+                          <?php foreach($products as $product): ?>
+                          <option value="<?=$product->id?>" <?=($preorder->product_id == $product->id) ? "selected='selected'" : ""?>><?=$product->name?></option>
+                          <?php endforeach; ?>
+                        </select>
                       </div>
                     </div>
                     
-                    <h4>Kundendaten</h4>
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="building_units">Vorname *</label>
+                      <label class="col-lg-2 col-form-label" for="price_setup">Netto Preis Setup *</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="building_id_search" id="building_id_search" />
+                        <input type="text" class="form-control" name="price_setup" id="price_setup" />
                       </div>
                     </div>
                     
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="price">Netto Preis Periodisch *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="price" id="price" />
+                      </div>
+                    </div>
+                    
+                    <?php if($me->isAdmin()): ?>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="price_nne">Preis NNE *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="price_nne" id="price_nne" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="price_nbe">Preis NBE *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="price_nbe" id="price_nbe" />
+                      </div>
+                    </div>
+                    <?php endif; ?>
+                    
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="billing_delay">Verzögerter Verrechnungsstart *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="billing_delay" id="billing_delay" placeholder="Freimonate" />
+                      </div>
+                    </div>
+                    
+                    <h4 class="mt-4">Kundendaten</h4>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="company">Firma</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="company" id="company" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="uid">UID</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="uid" id="uid" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="firstname">Vorname *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="firstname" id="firstname" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="lastname">Nachname *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="lastname" id="lastname" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="street">Straße *</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="street" id="street" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="zip">PLZ / Ort *</label>
+                      <div class="col-lg-3">
+                        <input type="text" class="form-control" name="zip" id="zip" />
+                      </div>
+                      <div class="col-lg-7">
+                        <input type="text" class="form-control" name="city" id="city" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="phone">Telefon</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="phone" id="phone" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="email">Email</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="email" id="email" />
+                      </div>
+                    </div>
+                    
+                    
                   <div>
                   
                   
@@ -262,6 +373,11 @@
       var oan_id = $('input[name=building_id][value=' + id + ']').data("oanid");
       var units = $('input[name=building_id][value=' + id + ']').data("units");
       
+      $('input[name=street]').val(street);
+      $('input[name=zip]').val(zip);
+      $('input[name=city]').val(city);
+      
+      
       var label = street + "<br />" + zip + " " + city;
       label += "<br /><div style='font-weight: normal;'>Wohneinheiten: " + units;
       if(code || oan_id) {
@@ -303,6 +419,33 @@
     $('#building_id_search').keyup();
   }
   
+  
+  function updateProduct() {
+    var pid = $('#product_id').val();
+    if(!pid) {
+      return false;
+    }
+    
+    $.get("<?=self::getUrl("Product", "Api")?>",
+    {
+      "do": "getProduct",
+      product_id: pid,
+      form_id: 0
+    },
+    function (success) {
+      //console.log(success);
+      p = success.result.product;
+      
+      $('#billing_delay').val(p.billing_delay);
+      $('#billing_period').val(p.billing_period);
+      $('#price').val(p.price);
+      //$('#price_setup').val(p.price_setup);
+      $('#price_nne').val(p.price_nne);
+      $('#price_nbe').val(p.price_nbe);
+    },
+    'json');
+    
+  }
 </script>
     
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
\ No newline at end of file
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 87249750b..9a0de2b0d 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -52,7 +52,13 @@ class PreorderController extends mfBaseController {
     $campaign = new Preordercampaign($campaign_id);
     $this->layout()->set("campaign", $campaign);
     
-    
+    $products = [];
+    foreach(ProductNetworkModel::search(["network_id" => $network_ids]) as $pn) {
+      if(!array_key_exists($pn->product_id, $products)) {
+        $products[$pn->product_id] = $pn->product;
+      }
+    }
+    $this->layout()->set("products", $products);
   }