diff --git a/backend/services/mail/mail-service/src/main/kotlin/at/mocode/mail/service/MailServiceApplication.kt b/backend/services/mail/mail-service/src/main/kotlin/at/mocode/mail/service/MailServiceApplication.kt
index ee74a158..4b84013f 100644
--- a/backend/services/mail/mail-service/src/main/kotlin/at/mocode/mail/service/MailServiceApplication.kt
+++ b/backend/services/mail/mail-service/src/main/kotlin/at/mocode/mail/service/MailServiceApplication.kt
@@ -40,7 +40,7 @@ class MailServiceApplication(private val env: Environment) {
     log.info("----------------------------------------------------------")
     log.info("Application '{}' is running!", appName)
     log.info("Spring Management Port: {}", springPort)
-    log.info("SMTP Config: host={}, port={}, user={}", mailHost, mailPort, mailUser)
+    log.info("SMTP Config (from Env): host={}, port={}, user={}", mailHost, mailPort, mailUser)
     log.info("Profiles:               {}", env.activeProfiles.joinToString(", "))
     log.info("----------------------------------------------------------")
   }
diff --git a/backend/services/mail/mail-service/src/main/resources/application.yaml b/backend/services/mail/mail-service/src/main/resources/application.yaml
index 184a4dc5..1f55509c 100644
--- a/backend/services/mail/mail-service/src/main/resources/application.yaml
+++ b/backend/services/mail/mail-service/src/main/resources/application.yaml
@@ -11,16 +11,16 @@ spring:
       ddl-auto: update
     show-sql: true
   mail:
-    host: ${SPRING_MAIL_HOST:smtp.world4you.com}
-    port: ${SPRING_MAIL_PORT:587}
-    username: ${SPRING_MAIL_USERNAME:online-nennen@mo-code.at}
-    password: ${SPRING_MAIL_PASSWORD:Mogi#2reiten}
+    host: smtp.world4you.com
+    port: 587
+    username: online-nennen@mo-code.at
+    password: Mogi#2reiten
     properties:
       mail:
         smtp:
-          auth: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:true}
+          auth: true
           starttls:
-            enable: ${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:true}
+            enable: true
 
   cloud:
     consul:
diff --git a/frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/frontend/shell/web/WebMainScreen.kt b/frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/frontend/shell/web/WebMainScreen.kt
index cbd1e3bc..8c9ea2c7 100644
--- a/frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/frontend/shell/web/WebMainScreen.kt
+++ b/frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/frontend/shell/web/WebMainScreen.kt
@@ -130,7 +130,7 @@ fun MainAppContent() {
       // Dezentraler Versions-Marker in der unteren rechten Ecke
       Box(modifier = Modifier.fillMaxSize().padding(8.dp), contentAlignment = Alignment.BottomEnd) {
         Text(
-          text = "v2026-04-23.36 - SMTP DIAGNOSE",
+          text = "v2026-04-23.37 - SMTP HARD-CODED",
           style = MaterialTheme.typography.labelSmall,
           color = Color.LightGray.copy(alpha = 0.5f)
         )