diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index c1e9954a9..167797801 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -32,6 +32,19 @@
                 <div class="card-body">
             
                   <input type="hidden" name="id" value="<?=$address->id?>" />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="parent_id">Gehört zu</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control " name="parent_id" id="parent_id" data-placeholder="Choose ...">
+                        <option value=""></option>
+                        <?php foreach($parents as $parent): ?>
+                          <option value="<?=$parent->id?>" <?=($address->parent_id == $parent->id) ? "selected='selected'" : ""?>><?=($parent->company) ? $parent->company : $parent->getFullName()?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="company">Firmenname</label>
                     <div class="col-lg-10">
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 72a49e1de..3d4b8fa1a 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -26,6 +26,9 @@ class AddressController extends mfBaseController {
       return $this->addAction();
     }
     
+    $parents = AddressModel::search(['parent_id' => 0]);
+    $this->layout()->set("parents", $parents);
+    
     return $this->addAction();
   }
   
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index ea1cffcfe..8b73d835b 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -122,4 +122,5 @@ class AddressModel {
     
     return $where;
   }
+  
 }
\ No newline at end of file