diff --git a/Layout/default/Preorderlogistics/Index.php b/Layout/default/Preorderlogistics/Index.php
index 40cc85cb0..e40d24773 100644
--- a/Layout/default/Preorderlogistics/Index.php
+++ b/Layout/default/Preorderlogistics/Index.php
@@ -103,12 +103,12 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
                                 data-ucode="<?= $preorder->ucode ?>"
                                 data-oaid="<?= $preorder->oaid ?>"
                                 data-addr-name="<?= htmlspecialchars($preorder->company ?: "{$preorder->firstname} {$preorder->lastname}", ENT_QUOTES) ?>"
-                                data-addr-street="<?= htmlspecialchars(trim("{$preorder->street} {$preorder->housenumber}"), ENT_QUOTES) ?>"
-                                data-addr-zip="<?= $preorder->zip ?>"
-                                data-addr-city="<?= htmlspecialchars($preorder->city, ENT_QUOTES) ?>"
+                                data-addr-street="<?= htmlspecialchars($preorder->adb_hausnummer_id ? "{$preorder->adb_hausnummer->strasse->name} {$preorder->adb_hausnummer->hausnummer}" : trim("{$preorder->street} {$preorder->housenumber}"), ENT_QUOTES) ?>"
+                                data-addr-zip="<?= htmlspecialchars($preorder->adb_hausnummer_id ? $preorder->adb_hausnummer->plz->plz : $preorder->zip, ENT_QUOTES) ?>"
+                                data-addr-city="<?= htmlspecialchars($preorder->adb_hausnummer_id ? $preorder->adb_hausnummer->ortschaft->name : $preorder->city, ENT_QUOTES) ?>"
                                 data-phone="<?= $preorder->phone ?>"
                                 data-email="<?= $preorder->email ?>">
-                                <td class="text-right align-middle">
+                            <td class="text-right align-middle">
                                     <button type="button" class="btn btn-sm btn-success font-weight-bold" onclick="printShippingSlip(<?= $preorder->id ?>)"><i class="fas fa-fw fa-print"></i> DRUCKEN</button>
                                 </td>
                                 <td class="text-center align-middle">
diff --git a/Layout/default/Preorderlogistics/Print.template.php b/Layout/default/Preorderlogistics/Print.template.php
index 61795d3e7..c71a980eb 100644
--- a/Layout/default/Preorderlogistics/Print.template.php
+++ b/Layout/default/Preorderlogistics/Print.template.php
@@ -35,18 +35,27 @@
       </div>
 
       <div style="margin-top: 28pt">
-        <p>
-        <?php if($preorder->company): ?>
-          <?=nl2br($preorder->company)?><br />
-        <?php else: ?>
-          <br />
-        <?php endif; ?>
-        <?php if($preorder->lastname): ?>
-          <?=$preorder->firstname?> <?=$preorder->lastname?><br />
-        <?php endif; ?>
-        <?=$preorder->street?> <?=$preorder->housenumber?><br />
-        <?=$preorder->zip?> <?=$preorder->city?>
-        </p>
+          <p>
+              <?php if($preorder->company): ?>
+                  <?=nl2br(htmlspecialchars($preorder->company))?><br />
+              <?php else: ?>
+                  <br />
+              <?php endif; ?>
+              <?php if($preorder->lastname): ?>
+                  <?=htmlspecialchars($preorder->firstname)?> <?=htmlspecialchars($preorder->lastname)?><br />
+              <?php endif; ?>
+
+              <?php if ($preorder->adb_hausnummer_id): ?>
+                  <?= htmlspecialchars($preorder->adb_hausnummer->strasse->name) ?> <?= htmlspecialchars($preorder->adb_hausnummer->hausnummer) ?><br/>
+                  <?php if ($preorder->adb_wohneinheit_id && (string)$preorder->adb_wohneinheit): ?>
+                      <?= htmlspecialchars((string)$preorder->adb_wohneinheit) ?><br />
+                  <?php endif; ?>
+                  <?= htmlspecialchars($preorder->adb_hausnummer->plz->plz) ?> <?= htmlspecialchars($preorder->adb_hausnummer->ortschaft->name) ?>
+              <?php else: ?>
+                  <?=htmlspecialchars($preorder->street)?> <?=htmlspecialchars($preorder->housenumber)?><br />
+                  <?=htmlspecialchars($preorder->zip)?> <?=htmlspecialchars($preorder->city)?>
+              <?php endif; ?>
+          </p>
         <p style="text-align: right; padding-top: 4pt;">Liezen, <?=date("d.m.Y")?></p>
 
         <p style="padding-top: 4pt;">Liebe(r) <?=($preorder->firstname) ? $preorder->firstname : ""?> <?=($preorder->lastname) ? $preorder->lastname : ""?>,</p>