diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 36e0b91cd..859d87e4d 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -156,6 +156,7 @@
                     <div class="col-lg-10">
                       <select class="select2 form-control select2-multiple" name="addresstypes[]" id="addresstypes" multiple="multiple" data-placeholder="Choose ...">
                         <option value="systemowner" <?=(array_key_exists("systemowner", $address->types)) ? "selected='selected'" : ""?>><?=__("systemowner")?></option>
+                        <option value="company" <?=(array_key_exists("company", $address->types)) ? "selected='selected'" : ""?>><?=__("company")?></option>
                         <option value="netowner" <?=(array_key_exists("netowner", $address->types)) ? "selected='selected'" : "netowner"?>><?=__("netowner")?></option>
                         <option value="salespartner" <?=(array_key_exists("salespartner", $address->types)) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
                         <option value="pipeworker" <?=(array_key_exists("pipeworker", $address->types)) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>
diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 6cee61252..695d9b5a8 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -366,6 +366,11 @@
                 <div class="card-body">
                   <h4>Produkte</h4>
                   
+                  <div class="row col-12 mt-2 mb-2">
+                    <label><input type="checkbox" class="input-check" name="upgrade" value="1" <?=($order->upgrade) ? "checked='checked'" : ""?> /> Bestellung ist Upgrade</label>
+                  </div>
+                  <div></div>
+                  
                   <?php if(is_array($order->products) && count($order->products)): ?>
                   <?php foreach($order->products as $product): ?>
                   <?php
diff --git a/application/Cpeprovisioning/CpeprovisioningController.php b/application/Cpeprovisioning/CpeprovisioningController.php
index 60f2cf533..ee1830c5e 100644
--- a/application/Cpeprovisioning/CpeprovisioningController.php
+++ b/application/Cpeprovisioning/CpeprovisioningController.php
@@ -106,7 +106,7 @@ class CpeprovisioningController extends mfBaseController {
       $order_filter["finish_date"] = null;
     }
     
-    
+    $new_filter['upgrade'] = 0;
     
     
     foreach($filter as $name => $value) {
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 8ef65af49..d3a2cb4a8 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -462,6 +462,10 @@ class OrderController extends mfBaseController {
       $order_data['finish_after_comment'] = $r->finish_after_comment;
     }
     
+    $order_data['upgrade'] = 0;
+    if($r->upgrade === "1") {
+      $order_data['upgrade'] = 1;
+    }
     
     $send_to_bill_email = false;
     $order_data['edit_by'] = $this->me->id;
@@ -574,6 +578,8 @@ class OrderController extends mfBaseController {
         }
         $product_data["billing_period"] = $p["billing_period"];
         
+        $product_data['upgrade'] = $order_data['upgrade'];
+        
         
         $require_term = false;
         if(array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $prod->attributes) && $prod->attributes[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 1) {
diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php
index bb91c5e82..e3bbc6b19 100644
--- a/application/Order/OrderModel.php
+++ b/application/Order/OrderModel.php
@@ -3,6 +3,7 @@
 class OrderModel {
   public $owner_id;
   public $billingaddress_id;
+  public $upgrade;
   public $partner_number;
   public $order_date;
   public $finish_date;
@@ -270,6 +271,14 @@ class OrderModel {
       }
     }
     
+    if(array_key_exists("upgrade", $filter)) {
+      if($filter['upgrade'] == 1) {
+        $where .= " AND `Order`.upgrade = 1";
+      } else {
+        $where .= " AND `Order`.upgrade = 0";
+      }
+    }
+    
     if(array_key_exists("name", $filter)) {
       $name = FronkDB::singleton()->escape($filter['name']);
       if($name) {
diff --git a/application/OrderProduct/OrderProductModel.php b/application/OrderProduct/OrderProductModel.php
index 8789921e1..af57296d2 100644
--- a/application/OrderProduct/OrderProductModel.php
+++ b/application/OrderProduct/OrderProductModel.php
@@ -4,6 +4,7 @@ class OrderProductModel {
   public $order_id;
   public $product_id;
   public $termination_id;
+  public $upgrade;
   public $amount;
   public $pos;
   public $description;
diff --git a/lang/de.php b/lang/de.php
index 5a9efb963..baa07985a 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -2,6 +2,7 @@
 
 $l = [];
 $l['systemowner'] = "Systembesitzer";
+$l['company'] = "Mandant";
 $l['netowner'] = "Netzeigentümer";
 $l['salespartner'] = "Vertriebspartner";
 $l['pipeworker'] = "Tiefbau";