diff --git a/src/model/boat.rs b/src/model/boat.rs
index df3e9fd..8f8ef75 100644
--- a/src/model/boat.rs
+++ b/src/model/boat.rs
@@ -261,8 +261,8 @@ WHERE
     b.external = false 
     AND b.location_id = (SELECT id FROM location WHERE name = 'Linz')
     AND b.deleted = false
-ORDER BY 
-    b.name DESC;
+ORDER BY
+    b.amount_seats ASC, b.name ASC;
         "
         )
         .fetch_all(db)
diff --git a/templates/boatreservations.html.tera b/templates/boatreservations.html.tera
index ffd0b7d..289077d 100644
--- a/templates/boatreservations.html.tera
+++ b/templates/boatreservations.html.tera
@@ -19,7 +19,7 @@
         <div class="hidden">
             <div id="new-reservation">
                 <form action="/boatreservation/new" method="post" class="grid gap-3">
-                    {{ log::boat_select(only_ones=false, id='boat') }}
+                    {{ log::boat_select(id='boat', allow_on_water=true, grouped_by_boattype=true) }}
                     {% if not loggedin_user %}{{ macros::select(label='Reserviert von', data=user, name='user_id_applicant') }}{% endif %}
                     {{ macros::input(label='Beginn', name='start_date', type='date', required=true, wrapper_class='col-span-4') }}
                     {{ macros::input(label='Ende', name='end_date', type='date', required=true, wrapper_class='col-span-4') }}
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index ef67872..d4295ed 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -73,8 +73,18 @@
                class="btn btn-primary w-full col-span-4 m-auto" />
     </form>
 {% endmacro new %}
-{% macro boat_select(id="boat_id") %}
-    {{ macros::select(label="Boot", data=boats, name="boat_id", required=true, 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 ---") }}
+{% macro boat_select(id="boat_id", allow_on_water=false, grouped_by_boattype=false) %}
+    {% if grouped_by_boattype %}
+        <div class="col-span-4">
+            <label class="text-sm text-gray-600 dark:text-gray-100">Boot</label>
+            <select name="boat_id" id="{{ id }}" class="input rounded-md" required>
+                <option disabled selected value> -- Wähle ein Boot aus ---</option>
+                {% for cat, g in boats | group_by(attribute="cat") %}<optgroup label="{{ cat }}">{% for b in g %}<option value="{{ b.id }}">{{ b.name }}{% if b.on_water %} (am Wasser){% endif %}</option>{% endfor %}</optgroup>{% endfor %}
+            </select>
+        </div>
+    {% else %}
+        {{ macros::select(label="Boot", data=boats, name="boat_id", required=true, 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 ---", allow_on_water=allow_on_water) }}
+    {% endif %}
 {% 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 2a8953c..35a81cf 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -274,7 +274,7 @@ function setChoiceByLabel(choicesInstance, label) {
         {{ 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='', nonSelectableDefault=false, only_ergo=false) %}
+{% 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, only_ergo=false, allow_on_water=false) %}
     <div class="{{ wrapper_class }}">
         <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
         {% if display == '' %}
@@ -290,7 +290,7 @@ function setChoiceByLabel(choicesInstance, label) {
                 <option value="{{ d.id }}"
                         {% if only_ergo and d.id!=4 %}disabled{% endif %}
                         {% 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 %}
+                        {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data- {{ extra }}={{ d[extra] }} {% else %} {% if d[extra] and not allow_on_water %}disabled{% endif %}
                         {% endif %}
                         {% endfor %}
                         {% endif %}