diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 27f7948aa..99cd49179 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -293,8 +293,8 @@
                     <label class="col-lg-2 col-form-label" for="billing_type">Verrechnungsart</label>
                     <div class="col-lg-10">
                       <select class="form-control" name="billing_type" id="billing_type">
+                        <option value="invoice" <?=($order->billing_type == "invoice") ? "selected='selected'" : ""?>>Rechnung</option>
                         <option value="sepa" <?=($order->billing_type == "sepa") ? "selected='selected'" : ""?>>SEPA Bankeinzug</option>
-                        <option value="invoice" <?=($order->billing_type != "sepa") ? "selected='selected'" : ""?>>Rechnung</option>
                       </select>
                     </div>
                   </div>
@@ -834,10 +834,15 @@
       checkEmpty.push("billing_phone");
       checkEmpty.push("billing_email");
     }
+    
+    //alert("error: " + error);
+    
     if(!$('#billingaddress_id :selected').val()) {
-      $('#billingaddress_id').addClass("invalid");
-      $('#billingaddress_id').next().find('.select2-selection').addClass('invalid');
-      error = true;
+      if(!$('#owner_id :selected').val()) {
+        $('#billingaddress_id').addClass("invalid");
+        $('#billingaddress_id').next().find('.select2-selection').addClass('invalid');
+        error = true;
+      }
     }
 
     // check bankdaten
@@ -856,7 +861,7 @@
     if(checkEmpty.length) {
       checkEmpty.forEach(function(field) {
         if(!$("#" + field).val().length) {
-          console(field + " empty");
+          console.log(field + " empty");
           $("#" + field).addClass("invalid");
           error = true;
         }