diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 326f52145..c0199652d 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -24,6 +24,7 @@
         <loop class="Thelia\Core\Template\Loop\Order" name="order"/>
         <loop class="Thelia\Core\Template\Loop\OrderStatus" name="order-status"/>
         <loop class="Thelia\Core\Template\Loop\CategoryPath" name="category-path"/>
+        <loop class="Thelia\Core\Template\Loop\Payment" name="payment"/>
         <loop class="Thelia\Core\Template\Loop\Product" name="product"/>
         <loop class="Thelia\Core\Template\Loop\ProductSaleElements" name="product_sale_elements"/>
         <loop class="Thelia\Core\Template\Loop\Feed" name="feed"/>
diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html
index 865fdb267..b08283c6c 100644
--- a/templates/default/order_invoice.html
+++ b/templates/default/order_invoice.html
@@ -258,11 +258,15 @@
 
                 {/form_field}
 
+                {form_field form=$form field='payment-module'}
+
                 <div id="payment-method" class="panel">
                     <div class="panel-heading">Choose your payment method</div>
                     <div class="panel-body">
                         <ul class="list-payment">
-                            <?php foreach ($payment as $key => $value) { ?>
+
+                            {loop type="payment" name="payments" force_return="true"}
+
                             <li>
                                 <div class="radio">
                                     <label for="payment_<?php echo $key; ?>">
@@ -271,10 +275,14 @@
                                     </label>
                                 </div>
                             </li>
-                            <?php } ?>
+
+                            {/loop}
+
                     </div>
                 </div>
 
+                {/form_field}
+
                 <a href="{url path="/order/delivery"}" role="button" class="btn btn-back"><span>Back</span></a>
                 <button type="submit" class="btn btn-checkout-next"><span>TO REMOVE</span></button>
             </form>