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 b6e1d345..ee74a158 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
@@ -33,9 +33,14 @@ class MailServiceApplication(private val env: Environment) {
     val springPort = env.getProperty("server.port", "8083")
     val appName = env.getProperty("spring.application.name", "mail-service")
 
+    val mailHost = env.getProperty("spring.mail.host", "N/A")
+    val mailPort = env.getProperty("spring.mail.port", "N/A")
+    val mailUser = env.getProperty("spring.mail.username", "N/A")
+
     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("Profiles:               {}", env.activeProfiles.joinToString(", "))
     log.info("----------------------------------------------------------")
   }
diff --git a/dc-planb.yaml b/dc-planb.yaml
index f064ff95..44431ff3 100644
--- a/dc-planb.yaml
+++ b/dc-planb.yaml
@@ -21,17 +21,17 @@ services:
     restart: unless-stopped
     environment:
       # Server-Port im Container (Spring Boot)
-      SERVER_PORT: ${SERVER_PORT:-8085}
+      SERVER_PORT: "8085"
 
       # Plan-B: Zipkin-Fehler unterdrücken
       MANAGEMENT_TRACING_ENABLED: "false"
       SPRING_ZIPKIN_ENABLED: "false"
 
       # SMTP (World4You - PROD)
-      SPRING_MAIL_HOST: ${SPRING_MAIL_HOST:-smtp.world4you.com}
-      SPRING_MAIL_PORT: ${SPRING_MAIL_PORT:-587}
-      SPRING_MAIL_USERNAME: ${SPRING_MAIL_USERNAME:-online-nennen@mo-code.at}
-      SPRING_MAIL_PASSWORD: ${SPRING_MAIL_PASSWORD:-Mogi#2reiten}
+      SPRING_MAIL_HOST: "smtp.world4you.com"
+      SPRING_MAIL_PORT: "587"
+      SPRING_MAIL_USERNAME: "online-nennen@mo-code.at"
+      SPRING_MAIL_PASSWORD: "Mogi#2reiten"
       SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "true"
       SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "true"
 
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 0e474407..cbd1e3bc 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.35 - SMTP FIX",
+          text = "v2026-04-23.36 - SMTP DIAGNOSE",
           style = MaterialTheme.typography.labelSmall,
           color = Color.LightGray.copy(alpha = 0.5f)
         )