diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
index 5c802f7e..56e3887c 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
@@ -104,9 +104,11 @@
                             <tr v-if="participant.surcharges.length > 0">
                               <th>Zuschläge</th>
                               <td>
-                                <p v-for="surcharge in participant.surcharges">
-                                  {{ surcharge.priceSingle.toFixed(2) }} € ({{ surcharge.name }})
-                                </p>
+                                <ul class="list-unstyled">
+                                  <li v-for="surcharge in participant.surcharges">
+                                    {{ surcharge.priceSingle.toFixed(2) }} € <span v-show="surcharge.name">({{ surcharge.name }})</span>
+                                  </li>
+                                </ul>
                               </td>
                             </tr>
                             <tr>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
index 2e417ac5..0409d4ad 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="relative" v-if="mutable">
+    <div class="relative" v-if="mutable && selectableAccommodations.length > 0">
         <button class="btn btn-primary btn-sm w-full lg:w-auto" type="button" @click.prevent="visible = !visible">
             Zimmer <span class="glyphicon" :class="{ 'glyphicon-chevron-up': visible, 'glyphicon-chevron-down': !visible }"></span>
         </button>