diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 7469a1799..bbf80ea0d 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -794,6 +794,7 @@
       p = success.result.product;
       id = success.result.form_id;
       
+      $('#billing_delay-' + id).val(p.billing_delay);
       $('#billing_period-' + id).val(p.billing_period);
       $('#price-' + id).val(p.price);
       $('#price_setup-' + id).val(p.price_setup);
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 9db343031..558e61e47 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -867,4 +867,4 @@ class OrderController extends mfBaseController {
     }
   }
   
-}
\ No newline at end of file
+}
diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php
index 92c15b0d8..ed2d062e5 100644
--- a/application/Order/OrderModel.php
+++ b/application/Order/OrderModel.php
@@ -114,7 +114,6 @@ class OrderModel {
             LEFT JOIN Product ON (Product.id = OrderProduct.product_id)
             WHERE
             GROUP BY `Order`.id
-            
             ";
   }
   
@@ -159,6 +158,7 @@ class OrderModel {
     
     $sql = "SELECT COUNT(*) as cnt FROM
               (SELECT `Order`.id FROM `Order`
+              LEFT JOIN Address ON (Address.id = `Order`.owner_id)
               LEFT JOIN OrderProduct ON (OrderProduct.order_id = `Order`.id)
               LEFT JOIN Product ON (Product.id = OrderProduct.product_id)
               LEFT JOIN Termination ON (Termination.id = OrderProduct.termination_id)
diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php
index cc1f2a6f7..366248b5d 100644
--- a/application/Product/ProductModel.php
+++ b/application/Product/ProductModel.php
@@ -11,6 +11,7 @@ class ProductModel {
   public $price_setup = null;
   public $price_nne = null;
   public $price_nbe = null;
+  public $billing_delay = null;
   public $billing_period = null;
   public $ivt_id = null;