diff --git a/frontend/scss/components/_input.scss b/frontend/scss/components/_input.scss
index 136715e..77522dd 100644
--- a/frontend/scss/components/_input.scss
+++ b/frontend/scss/components/_input.scss
@@ -69,7 +69,7 @@ select {
   margin-right: 25px;
   height: 20px;
   width: 20px;
-  border-radius: 10em;
+  @apply rounded-md;
   opacity: 0.25;
 }
 .choices[data-type*=select-one] .choices__button:hover, .choices[data-type*=select-one] .choices__button:focus {
@@ -140,7 +140,6 @@ select {
   display: inline-block;
   vertical-align: top;
   width: 100%;
-  background-color: #f9f9f9;
   padding: 7.5px 7.5px 3.75px;
   border: 1px solid #ddd;
   border-radius: 2.5px;
@@ -182,14 +181,12 @@ select {
 .choices__list--multiple .choices__item {
   display: inline-block;
   vertical-align: middle;
-  border-radius: 20px;
+  @apply rounded-md bg-primary-600;
   padding: 4px 10px;
   font-size: 12px;
   font-weight: 500;
   margin-right: 3.75px;
   margin-bottom: 3.75px;
-  background-color: #00bcd4;
-  border: 1px solid #00a5bb;
   color: #fff;
   word-break: break-all;
   box-sizing: border-box;
@@ -323,7 +320,6 @@ select {
 .choices__input {
   display: inline-block;
   vertical-align: baseline;
-  background-color: #f9f9f9;
   font-size: 14px;
   margin-bottom: 5px;
   border: 0;
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index dbd4fef..71ba728 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -35,12 +35,12 @@
 			<select name="shipmaster" id="shipmaster" class="input rounded-md h-10">
 				<optgroup label="Steuerleute">
 					{% for cox in coxes %}
-						<option value="{{ cox.id }}" {% if cox.id == shipmaster%} selected {% endif %} {% if cox.on_water %} disabled="disabled" {% endif %}>{{ cox.name }} {% if cox.on_water %} (am Wasser) {% endif %}</option>
+						<option value="{{ cox.id }}" {% if cox.on_water %} disabled="disabled" {% else %} {% if cox.id == shipmaster %} selected {% endif %}  {% endif %}>{{ cox.name }} {% if cox.on_water %} (am Wasser) {% endif %}</option>
 					{% endfor %}
 				</optgroup>
 				<optgroup label="Mitglieder">
 					{% for user in users | filter(attribute="is_cox", value=false) %}
-						<option value="{{ user.id }}" {% if user.id == shipmaster%} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %}>{{ user.name }} {% if cox.on_water %} (am Wasser) {% endif %}</option>
+						<option value="{{ user.id }}" {% if user.id == shipmaster %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %}>{{ user.name }} {% if user.on_water %} (am Wasser) {% endif %}</option>
 					{% endfor %}
 				</optgroup>
 			</select>
@@ -70,7 +70,7 @@
     </div>
 
 		<div class="relative">
-			{{ macros::input(label="Distanz", name="distance_in_km", id="distance_in_km" , type="number", min=0, value='', required=true, class="rounded-md") }}
+			{{ macros::input(label="Distanz", name="distance_in_km", id="distance_in_km" , type="number", min=0, value='', class="rounded-md") }}
 			<span class="absolute right-0 bottom-0 py-1.5 px-2 bg-white border-0 text-gray-600 ring-1 ring-inset ring-gray-300 rounded-br-md rounded-tr-md">km</span>
 		</div>
 
@@ -105,7 +105,7 @@
               {% set_global sel = true %}
             {% endif %}
           {% endfor %}
-          <option value="{{ user.id }}" {% if sel %} selected {% endif %}>{{user.name}}</option>
+          <option value="{{ user.id }}" {% if sel %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %}>{{user.name}} {% if user.on_water %} (am Wasser) {% endif %}</option>
         {% endfor %}
       </select>
     </div>