diff --git a/frontend/main.ts b/frontend/main.ts
index a7497fd..8a71157 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -154,8 +154,15 @@ function selectBoatChange() {
 
         if (event.detail.customProperties.owner) {
           choiceObjects["newrower"].setChoiceByValue(
-            event.detail.customProperties.owner + "",
+            event.detail.customProperties.owner.toString(),
           );
+
+          if(event.detail.value === '36') {
+              /** custom code for Etsch */
+              choiceObjects["newrower"].setChoiceByValue(
+                "81",
+              );
+          }
         }
 
         const inputElement = document.getElementById(