diff --git a/CHANGES.rst b/CHANGES.rst
index 9ae02041..7a119526 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -15,6 +15,11 @@ Changed
 - Model attributes cardinality is closer to SCIM model. :pr:`155`
 - Bump to htmx 1.9.9 :pr:`159`
 
+Fixed
+*****
+
+- Disable HTMX boosting during the OIDC dance. :pr:`160`
+
 [0.0.34] - 2023-10-02
 =====================
 
diff --git a/canaille/core/templates/password.html b/canaille/core/templates/password.html
index b1df1b3f..bce2b8f1 100644
--- a/canaille/core/templates/password.html
+++ b/canaille/core/templates/password.html
@@ -24,7 +24,7 @@
 
                 {{ flask.messages() }}
 
-                {% call fui.render_form(form) %}
+                {% call fui.render_form(form, hx_boost="false") %}
                     {{ login_field.render_field(form.password, class="autofocus") }}
 
                     <div class="ui right aligned container">
diff --git a/canaille/templates/macro/form.html b/canaille/templates/macro/form.html
index 6f74912e..b999cbb8 100644
--- a/canaille/templates/macro/form.html
+++ b/canaille/templates/macro/form.html
@@ -185,6 +185,7 @@ csrf=true) -%}
       role="form"
       enctype="multipart/form-data"
       class="ui form {{ class_ }}"
+      {% for key, value in kwargs.items() %}{{ key.replace("_", "-") }}="{{ value }}" {% endfor %}
 >
     {% if caller is defined %}
         {% if csrf %}