diff --git a/uncloud_pay/models.py b/uncloud_pay/models.py
index d1c03e7..6169d4f 100644
--- a/uncloud_pay/models.py
+++ b/uncloud_pay/models.py
@@ -670,6 +670,7 @@ class Product(UncloudModel):
         if not when_to_start:
             when_to_start = timezone.now()
 
+        # NEXT: find the latest order, use that one...
         # Update order = create new order
         if self.order:
             previous_order = self.order
diff --git a/uncloud_pay/templates/bill.html.j2 b/uncloud_pay/templates/bill.html.j2
index 5baa7ca..6fdfca8 100644
--- a/uncloud_pay/templates/bill.html.j2
+++ b/uncloud_pay/templates/bill.html.j2
@@ -672,16 +672,12 @@ oAsAAAAAAACGQNAFAAAAAAAAQyDoAgAAAAAAgCEQdAEAAAAAAMAQCLoAAAAAAABgCP83AL6WQ1Y7
         <br>
     </div>
     <div class="d1">
-        {% if bill.billing_address.organization != "" %}
-        <b>ORG{{ bill.billing_address.organization }}</b>
-        <br>{{ bill.billing_address }} <bill.owner.email>
-        {% else %}
-        <b>{{ bill.billing_address.name }} <bill.owner.email></b>
-        {% endif %}
-        <br>{{ bill.billing_address.street }}
-        <br>{{ bill.billing_address.postal_code }} {{ bill.billing_address.city }}
-        <br>{{ bill.billing_address.country }}
-            <br>
+        <b>{{ bill.billing_address.organization }}</b><br/>
+        <b>{{ bill.billing_address.name }}</b><br/>
+        {{ bill.owner.email }}<br/>
+        {{ bill.billing_address.street }}<br/>
+        {{ bill.billing_address.country }} {{ bill.billing_address.postal_code }} {{ bill.billing_address.city }}<br/>
+
     </div>
     <div class="d4">
         <div class="b1">