diff --git a/frontend/tests/log.spec.ts b/frontend/tests/log.spec.ts
index a5380b7..f835e84 100644
--- a/frontend/tests/log.spec.ts
+++ b/frontend/tests/log.spec.ts
@@ -12,7 +12,7 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
   await page.getByRole("link", { name: "Ausfahrt eintragen" }).click();
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
     await page.getByText('2x', { exact: true }).click();
@@ -54,7 +54,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
   await page.getByRole("link", { name: "Ausfahrt eintragen" }).click();
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7x)").nth(1).click();  
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
     await page.getByText('2x', { exact: true }).click();
@@ -107,7 +107,7 @@ test("Kiosk can start and cancel trip", async ({ page }, testInfo) => {
   await page.goto("/log/kiosk/ekrv2019/Linz");
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
     await page.getByText('2x', { exact: true }).click();
@@ -141,7 +141,7 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
 
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
     await page.getByText('2x', { exact: true }).click();
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index 79db3e5..f805e32 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -31,7 +31,7 @@
           method="post"
           id="form"
           class="grid grid-cols-4 gap-3"
-          onsubmit="Array.from(this.elements).forEach(e=>!e.value.trim()&&(e.disabled=true));">
+          onsubmit="if (!this.elements['boat_id'].value) { alert('Kein Boot ausgewählt'); return false; }Array.from(this.elements).forEach(e=>!e.value.trim()&&(e.disabled=true));">
         {{ log::boat_select() }}
         <div class="col-span-4 md:col-span-1">
             <div class="text-sm text-gray-600 dark:text-gray-100">Bootssteuerung</div>
@@ -70,7 +70,7 @@
     </form>
 {% endmacro new %}
 {% macro boat_select(id="boat_id") %}
-    {{ macros::select(label="Boot", data=boats, name="boat_id", id=id, display=["name", " (","cat",")"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true) }}
+    {{ macros::select(label="Boot", data=boats, name="boat_id", id=id, display=["name", " (","cat",")"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true, nonSelectableDefault=" -- Wähle ein Boot aus ---") }}
 {% endmacro boat_select %}
 {% macro rower_select(id, selected, amount_seats='', class='', init='false', cox_on_boat='', steering_person_id='') %}
     {#{% if not amount_seats or amount_seats > 1 %}#}
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index 3593c62..1a59716 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -147,7 +147,7 @@
         {{ label }}
     </label>
 {% endmacro checkbox %}
-{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
+{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='', nonSelectableDefault=false) %}
     <div class="{{ wrapper_class }}">
         <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
         {% if display == '' %}
@@ -158,6 +158,7 @@
                 class="input rounded-md {{ class }}"
                 {% if required %}required="required"{% endif %}>
             {% if default %}<option selected value>{{ default }}</option>{% endif %}
+            {% if nonSelectableDefault %}<option disabled selected value>{{ nonSelectableDefault }}</option>{% endif %}
             {% for d in data %}
                 <option value="{{ d.id }}" {% if d.id == selected_id %}selected{% endif %} {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data- {{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %} {% endif %} {% endfor %} {% endif %} {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}, "boat_reserved_today": {{ d["reserved_today"] }}, "convert_handoperated_possible": {{ d["convert_handoperated_possible"] }}, "default_handoperated": {{ d["default_shipmaster_only_steering"] }}}' {% endif %}>
                     {% for displa in display -%}