diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index 4e5db7c..53d4552 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -27,11 +27,10 @@
 {% endmacro show_boats %}
 
 {# Shows the form for creating a new logbook entry. #}
-{% macro new(only_ones, allow_any_shipmaster, shipmaster) %}
+{% macro new(only_ones, shipmaster) %}
 	<form action="/log" method="post" id="form" class="grid grid-cols-4 gap-3" onsubmit="Array.from(this.elements).forEach(e=>!e.value.trim()&&(e.disabled=true));">
 		{{ log::boat_select(only_ones=only_ones) }}
 
-		{% if allow_any_shipmaster %}
       <div class="col-span-4 md:col-span-3">
         <label for="shipmaster" class=" text-sm text-gray-600 ">Schiffsführer</label>
 
@@ -56,9 +55,6 @@
           </optgroup>
         </select>
       </div>
-		{% else %}
-			<input type="hidden" name="shipmaster" value="{{shipmaster}}"/>
-		{% endif %}
 		{% if not only_ones %}
       <div class="col-span-4 md:col-span-1">
       	<div class="text-sm text-gray-600">Bootssteuerung</div>
@@ -161,6 +157,9 @@
 						<div id="close{{ log.id }}">
 							{{ log::home(log=log, only_ones=only_ones) }}
 						</div>
+						<div>
+							LÖSCHEN
+						</div>
 					{% endif %}
 					<div id="log{{ log.id }}">
 						{% if log.destination %}
@@ -178,6 +177,10 @@
 						{% for rower in log.rowers %}
 							<p>{{ rower.name }}</p>
 						{% endfor %}
+
+						{% if allowed_to_close and state == "on_water" %}
+							<a href="/log/{{ log.id }}/delete" onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren :O');">LÖSCHEN</a>
+						{% endif %}
 					</div>
 				</div>
 			</div>
diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index 95cfb92..e3243cf 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -23,7 +23,7 @@
     <div class="md:col-span-3 bg-white rounded-md shadow">
       <h2 class="h2">Neue Ausfahrt</h2>
       <div class="p-3">
-        {{ log::new(only_ones=false, allow_any_shipmaster=true, shipmaster=-1) }}
+        {{ log::new(only_ones=false, shipmaster=-1) }}
       </div>
     </div>
     <div class="bg-white rounded-md shadow">
diff --git a/templates/log.html.tera b/templates/log.html.tera
index 09c24b5..d762149 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -25,7 +25,7 @@
 			<div class="md:col-span-3 bg-white rounded-md shadow">
 				<h2 class="h2">Neue Ausfahrt</h2>
 				<div class="p-3">
-					{{ log::new(only_ones=loggedin_user.is_cox==false, allow_any_shipmaster=loggedin_user.is_cox, shipmaster=loggedin_user.id) }}
+					{{ log::new(only_ones=loggedin_user.is_cox==false, shipmaster=loggedin_user.id) }}
 				</div>
 			</div>
 			<div class="bg-white rounded-md shadow">