diff --git a/Layout/default/AddressDB/Form.php b/Layout/default/AddressDB/Form.php
index 4e5776ade..17e4a108e 100644
--- a/Layout/default/AddressDB/Form.php
+++ b/Layout/default/AddressDB/Form.php
@@ -314,13 +314,17 @@
                   <hr />
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="visibility">Zugriffsbeschränkung</label>
+                    <label class="col-lg-2 col-form-label" for="visibility">API-Sichtbarkeit</label>
                     <div class="col-lg-10">
                       <select class="form-control" name="visibility" id="visibility">
-                        <option value="public">Sichtbar</option>
-                        <option value="private">Nicht sichtbar</option>
+                        <?php if(is_array($save_data) && array_key_exists("unit_count", $save_data)): ?>
+                          <option value="public">Sichtbar</option>
+                          <option value="private" <?=($save_data['visibility'] == "private") ? "selected='selected'" : ""?>>Nicht sichtbar</option>
+                        <?php else: ?>
+                          <option value="public">Sichtbar</option>
+                          <option value="private" <?=($address->visibility == "private") ? "selected='selected'" : ""?>>Nicht sichtbar</option>
+                        <?php endif; ?>
                       </select>
-                      <small>In Address- und Bestell-API</small>
                     </div>
                   </div>
                   
diff --git a/application/AddressDB/AddressDB.php b/application/AddressDB/AddressDB.php
index 355580862..89a105911 100644
--- a/application/AddressDB/AddressDB.php
+++ b/application/AddressDB/AddressDB.php
@@ -277,12 +277,27 @@ class AddressDB {
     $hausnummer_data['rollout'] = (trim($data['rollout'])) ? trim($data['rollout']) : null;
     $hausnummer_data['rollout_info'] = (trim($data['rollout_info'])) ? trim($data['rollout_info']) : null;
     $hausnummer_data['freigabe'] = json_encode($data['freigabe']);
-    $hausnummer_data['manual_add'] = date('U');
-    $hausnummer_data['manual_add_by'] = $me->id;
-    $hausnummer_data['manual_add_info'] = "thetool user ".$me->username." via AddressDB";
+    
+    if(!$hausnummer) {
+      $hausnummer_data['manual_add'] = date('U');
+      $hausnummer_data['manual_add_by'] = $me->id;
+      $hausnummer_data['manual_add_info'] = "thetool user ".$me->username." via AddressDB";
+    }
     $hausnummer_data['manual_update'] = date('U');
     $hausnummer_data['manual_update_by'] = $me->id;
     $hausnummer_data['manual_update_info'] = "thetool user ".$me->username." via AddressDB";
+    //var_dump($data);exit;
+    if(!$data["visibility"]) {
+      $hausnummer_data['visibility'] = "public";
+    } else {
+      switch($data['visibility']) {
+        case "private":
+          $hausnummer_data['visibility'] = "private";
+          break;
+        default:
+          $hausnummer_data['visibility'] = "public";
+      }
+    }
     
     //var_dump($hausnummer_data, $hausnummer);exit;
     
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index ba5ae40f3..8a015bf8b 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -270,7 +270,7 @@ class AddressDBController extends mfBaseController {
     if(!$this->me->is("Admin")) {
       $required[] = "netzgebiet_id";
     }
-    foreach(['adrcd','extref','rimo_id','netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde','grund_nr','gdaeigenschaft','meridian','rw','hw','gps_lat','gps_long','unit_count'] as $field) {
+    foreach(['adrcd','extref','rimo_id','netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde','grund_nr','gdaeigenschaft','meridian','rw','hw','gps_lat','gps_long','unit_count','visibility'] as $field) {
       if(in_array($field, $required)) {
         if(!trim($r->$field)) {
           $this->layout()->setFlash("'".ucfirst($field)."' darf nicht leer sein!", "error");