diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 9984e2196..662c7b2e4 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -247,6 +247,7 @@
                       <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" value="<?=$preorder->street?>" />
+                        <small><?=$preorder->street?></small>
                       </div>
                     </div>
                     <div class="form-group row">
@@ -442,9 +443,11 @@
       if(val) {
         $('#adb_wohneinheit_id').removeClass("is-invalid");
         
-        $('input[name=street]').val($('#adb_wohneinheit_id').data("street"));
-        $('input[name=zip]').val($('#adb_wohneinheit_id').data("zip"));
-        $('input[name=city]').val($('#adb_wohneinheit_id').data("city"));
+        if(!$('input[name=street]').val() &&  !$('input[name=zip]').val() && !$('input[name=city]').val()) {
+          $('input[name=street]').val($('#adb_wohneinheit_id').data("street") + " " + $('#adb_wohneinheit_id').data("housenumber"));
+          $('input[name=zip]').val($('#adb_wohneinheit_id').data("zip"));
+          $('input[name=city]').val($('#adb_wohneinheit_id').data("city"));
+        }
         
       } else {
         $('#adb_wohneinheit_id').addClass("is-invalid");