diff --git a/CHANGES.rst b/CHANGES.rst
index 9294643d..6c949a0b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_,
 and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 
+Fixed
+*****
+
+- Disabled HTMX boosting on OIDC forms to avoid errors.
+
+
 [0.0.28] - 2023-06-30
 =====================
 
diff --git a/canaille/templates/login.html b/canaille/templates/login.html
index 5b221f75..d425daee 100644
--- a/canaille/templates/login.html
+++ b/canaille/templates/login.html
@@ -4,7 +4,7 @@
 {% import 'partial/login_field.html' as login_field %}
 
 {% block container %}
-    <div class="ui container">
+    <div class="ui container" hx-boost="false">
         <div class="content">
             <div class="ui clearing segment">
                 {% if logo_url %}
@@ -36,7 +36,7 @@
                             {% if has_smtp and has_password_recovery %}
                                 <a type="button" class="ui right floated button" href="{{ url_for('account.forgotten') }}">{{ _("Forgotten password") }}</a>
                             {% endif %}
-                            <button type="submit" class="ui right floated primary button">{{ _("Continue") }}</button>
+                            <button type="submit" name="answer" class="ui right floated primary button" hx-boost="false">{{ _("Continue") }}</button>
                         </div>
                     </div>
                 {% endcall %}
diff --git a/canaille/templates/oidc/user/authorize.html b/canaille/templates/oidc/user/authorize.html
index be46bf6c..49edc3ec 100644
--- a/canaille/templates/oidc/user/authorize.html
+++ b/canaille/templates/oidc/user/authorize.html
@@ -2,7 +2,7 @@
 {% import 'macro/form.html' as fui %}
 
 {% block content %}
-    <div class="ui segment">
+    <div class="ui segment" hx-boost="false">
         {% if client.logo_uri %}
             <img class="ui centered tiny image" src="{{ client.logo_uri }}" alt="{{ client.client_name }}">
         {% endif %}