diff --git a/templates/booking/create/step_3.html.twig b/templates/booking/create/step_3.html.twig
index 9b23c2a..b4f803b 100644
--- a/templates/booking/create/step_3.html.twig
+++ b/templates/booking/create/step_3.html.twig
@@ -1,26 +1,5 @@
 {% extends 'layout.html.twig' %}
 
-{# Local form theme override for consistent fieldset rendering #}
-{% use 'forms.html.twig' %}
-
-{% block form_row %}
-    {%- if form.vars.expanded is defined and form.vars.expanded -%}
-        {# Expanded forms get fieldset wrapper #}
-        <fieldset class="mb-1">
-            <legend class="font-semibold mb-1">
-                {{- form.vars.label -}}
-            </legend>
-            {{- form_widget(form, {
-                'attr': attr|default({})
-            }) -}}
-            {{- form_errors(form) -}}
-            {{- form_help(form) -}}
-        </fieldset>
-    {%- else -%}
-        {{- parent() -}}
-    {%- endif -%}
-{% endblock %}
-
 {% block content %}
     <h1>Neue Buchung</h1>
 
@@ -43,7 +22,7 @@
             {# Payment method selection with HTMX #}
             <div id="form-payment"
                  hx-post="{{ path('app_booking_create_step_3_refresh') }}"
-                 hx-trigger="change from:input[type='radio']"
+                 hx-trigger="change"
                  hx-target="#form-payment"
                  hx-select="#form-payment"
                  hx-swap="outerHTML">