diff --git a/templates/booking/_participant_form.html.twig b/templates/booking/_participant_form.html.twig
index 92d53f6..27e1eef 100644
--- a/templates/booking/_participant_form.html.twig
+++ b/templates/booking/_participant_form.html.twig
@@ -22,7 +22,9 @@
     {% else %}
         <fieldset class="mb-1">
             <legend class="font-semibold mb-1">{{ label }}</legend>
-            <div class="text-sm text-gray-500">{{ undefinedLabel }}</div>
+            {% if undefinedLabel %}
+                <div class="text-sm text-gray-500">{{ undefinedLabel }}</div>
+            {% endif %}
         </fieldset>
     {% endif %}
 {% endmacro %}
@@ -162,22 +164,6 @@
                         }
                     }) }}
 
-                    {{ macros.service_field(form, 'rentals', 'Leihmaterial', {
-                        'attr': {
-                            'hx-trigger': 'change',
-                            'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
-                            'hx-target': '#main-content', 'hx-swap': 'innerHTML'
-                        }
-                    }, 'Bitte zuerst den Skipass auswählen') }}
-
-                    {{ macros.checkbox_field(form, 'rentalInsurance', 'Leihmaterial-Versicherung', {
-                        'attr': {
-                            'hx-trigger': 'change',
-                            'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
-                            'hx-target': '#main-content', 'hx-swap': 'innerHTML'
-                        }
-                    }, 'Nur bei Buchung von Leihmaterial') }}
-
                     {{ macros.service_field(form, 'board', 'Verpflegung', {
                         'attr': {
                             'hx-trigger': 'change',
@@ -186,6 +172,24 @@
                         }
                     }) }}
 
+                    <div>
+                        {{ macros.service_field(form, 'rentals', 'Leihmaterial', {
+                            'attr': {
+                                'hx-trigger': 'change',
+                                'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
+                                'hx-target': '#main-content', 'hx-swap': 'innerHTML'
+                            }
+                        }, 'Bitte zuerst den Skipass auswählen') }}
+
+                        {{ macros.checkbox_field(form, 'rentalInsurance', null, {
+                            'attr': {
+                                'hx-trigger': 'change',
+                                'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
+                                'hx-target': '#main-content', 'hx-swap': 'innerHTML'
+                            }
+                        }, null) }}
+                    </div>
+
                     <div class="col-span-2">
                         {# Insurance display for edit mode (read-only) #}
                         {% if bookingDto.mode == constant('App\\Form\\Model\\BookingDto::MODE_EDIT') and form.vars.data.participant.insurance %}