diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 859d87e4d..bc5493f1c 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -156,7 +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="productowner" <?=(array_key_exists("productowner", $address->types)) ? "selected='selected'" : ""?>><?=__("productowner")?></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/Address/Index.php b/Layout/default/Address/Index.php
index a380e69a7..338bc99b4 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -38,6 +38,7 @@
                   <label class="form-label" for="filter_addresstype">Rolle</label>
                   <select name="filter[addresstype][]" id="filter_addresstype" class="form-control" multiple="multiple">
                     <option value="systemowner" <?=(in_array("systemowner", $filter["addresstype"])) ? "selected='selected'" : ""?>><?=__("systemowner")?></option>
+                    <option value="productowner" <?=(in_array("productowner", $filter["addresstype"])) ? "selected='selected'" : ""?>><?=__("productowner")?></option>
                     <option value="netowner" <?=(in_array("netowner", $filter["addresstype"])) ? "selected='selected'" : "netowner"?>><?=__("netowner")?></option>
                     <option value="salespartner" <?=(in_array("salespartner", $filter["addresstype"])) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
                     <option value="pipeworker" <?=(in_array("pipeworker", $filter["addresstype"])) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>
diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php
index 2994cd7fe..5d08de955 100644
--- a/Layout/default/Product/Form.php
+++ b/Layout/default/Product/Form.php
@@ -54,6 +54,18 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="external_id">Produktbesitzer (Mandant)</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control" name="external_id" id="external_id">
+                        <option></option>
+                        <?php foreach(AddressModel::search(['addresstype' => ['productowner']]) as $owner): ?>
+                        <option value="<?=$owner->id?>" <?=($product->external_id == $owner->id) ? "selected='selected'" : ""?>><?=$owner->getCompanyOrName()?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="productgroup_id">Produktgruppe *</label>
                     <div class="col-lg-10">
diff --git a/application/Product/ProductController.php b/application/Product/ProductController.php
index d79f391c0..25a71f851 100644
--- a/application/Product/ProductController.php
+++ b/application/Product/ProductController.php
@@ -77,7 +77,18 @@ class ProductController extends mfBaseController {
     if($r->sla_id) {
       $data['sla_id'] = $r->sla_id;
     }
-    $data['external'] = ($r->external == 1) ? "1" : "0";
+    $data['external'] = ($r->external == 1) ? 1 : 0;
+    
+    if($data['external'] == 1) {
+      if(!is_numeric($r->external_id) || $r->external_id < 1) {
+        $this->layout()->setFlash("Bitte Produktbesitzer auswählen", "warn");
+        $this->layout()->set("product", $product);
+        return $this->add();
+      }
+      $data['external_id'] = $r->external_id;
+    }
+    //var_dump($data);exit;
+    
     $data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
     $data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;
     $data['price'] = ($r->price) ? Layout::commaToDot($r->price) : 0;
diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php
index 366248b5d..b6f5c7dac 100644
--- a/application/Product/ProductModel.php
+++ b/application/Product/ProductModel.php
@@ -5,6 +5,7 @@ class ProductModel {
   public $description = null;
   public $sla_id = null;
   public $external = null;
+  public $external_id;
   public $productgroup_id = null;
   public $producttech_id = null;
   public $price = null;
diff --git a/lang/de.php b/lang/de.php
index baa07985a..5a8fd0734 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -2,7 +2,7 @@
 
 $l = [];
 $l['systemowner'] = "Systembesitzer";
-$l['company'] = "Mandant";
+$l['productowner'] = "Mandant";
 $l['netowner'] = "Netzeigentümer";
 $l['salespartner'] = "Vertriebspartner";
 $l['pipeworker'] = "Tiefbau";