diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 41652ac2a..ca148782a 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -314,7 +314,7 @@
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-contact" data-toggle="tab" aria-expanded="false">Kontakt</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-files" data-toggle="tab" aria-expanded="false">Dokumente</a></li>
-                            <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-technician" data-toggle="tab" aria-expanded="false">Technische Herstellung</a></li>
+                            <!--<li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-technician" data-toggle="tab" aria-expanded="false">Technische Herstellung</a></li>-->
                           </ul>
                         </div>
                       
diff --git a/scripts/order-billingaddress-to-addresslink.php b/scripts/order-billingaddress-to-addresslink.php
index d80a560e6..1b1ac9590 100644
--- a/scripts/order-billingaddress-to-addresslink.php
+++ b/scripts/order-billingaddress-to-addresslink.php
@@ -21,6 +21,10 @@ foreach(OrderModel::getAll() as $order) {
     continue;
   }
   
+  if($order->billingaddress_id == $order->owner_id) {
+    continue;
+  }
+  
   $data['address_id'] = $order->billingaddress_id;
   $data['origin_address_id'] = $order->owner_id;
   $data['type'] = "billing";