diff --git a/website_sale_checkout_skip_payment/README.rst b/website_sale_checkout_skip_payment/README.rst
index e98c60d548..fc577a1bd7 100644
--- a/website_sale_checkout_skip_payment/README.rst
+++ b/website_sale_checkout_skip_payment/README.rst
@@ -78,6 +78,9 @@ Contributors
   * Alexandre Díaz
   * Carlos Roca
 * Martin Wilderoth <martin.wilderoth@linserv.se>
+* `Studio73 <https://www.studio73.es>`_:
+
+  * Miguel Gandia <miguel@studio73.es>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst b/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst
index 4c650f2628..e6ca403773 100644
--- a/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst
+++ b/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst
@@ -5,3 +5,6 @@
   * Alexandre Díaz
   * Carlos Roca
 * Martin Wilderoth <martin.wilderoth@linserv.se>
+* `Studio73 <https://www.studio73.es>`_:
+
+  * Miguel Gandia <miguel@studio73.es>
diff --git a/website_sale_checkout_skip_payment/static/description/index.html b/website_sale_checkout_skip_payment/static/description/index.html
index 221a83fc7b..fc4c95c250 100644
--- a/website_sale_checkout_skip_payment/static/description/index.html
+++ b/website_sale_checkout_skip_payment/static/description/index.html
@@ -428,6 +428,10 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 </ul>
 </li>
 <li>Martin Wilderoth &lt;<a class="reference external" href="mailto:martin.wilderoth&#64;linserv.se">martin.wilderoth&#64;linserv.se</a>&gt;</li>
+<li><a class="reference external" href="https://www.studio73.es">Studio73</a>:<ul>
+<li>Miguel Gandia &lt;<a class="reference external" href="mailto:miguel&#64;studio73.es">miguel&#64;studio73.es</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/website_sale_checkout_skip_payment/views/website_sale_template.xml b/website_sale_checkout_skip_payment/views/website_sale_template.xml
index ee7258284b..5a79ac7523 100644
--- a/website_sale_checkout_skip_payment/views/website_sale_template.xml
+++ b/website_sale_checkout_skip_payment/views/website_sale_template.xml
@@ -32,10 +32,15 @@
                 </form>
             </div>
         </xpath>
-        <xpath expr="//div[@id='payment_method']" position="attributes">
-            <attribute
+        <xpath
+            expr="//t[@t-if='website_sale_order.amount_total']"
+            position="attributes"
+        >
+          <attribute
                 name="t-if"
-            >(acquirers or tokens) and website_sale_order.amount_total and not website.checkout_skip_payment</attribute>
+                separator=" "
+                add="and not website.checkout_skip_payment"
+            />
         </xpath>
         <xpath expr="//div[hasclass('js_payment')]" position="attributes">
             <attribute