diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
index 1e22cf6..a58d395 100644
--- a/backend/src/main/resources/application-dev.properties
+++ b/backend/src/main/resources/application-dev.properties
@@ -5,14 +5,3 @@ spring.flyway.locations=classpath:db/migration,classpath:db/migration-dev
 spring.flyway.clean-disabled=false
 spring.flyway.clean-on-validation-error=true
 
-# Invite sender for local/dev demo
-app.invite.from-address=${MAIL_USERNAME:noreply.iksys@gmail.com}
-
-# Gmail SMTP — credentials supplied via MAIL_USERNAME / MAIL_PASSWORD env vars.
-# Leave both blank to disable email (invites won't work, everything else will).
-spring.mail.host=smtp.gmail.com
-spring.mail.port=587
-spring.mail.username=${MAIL_USERNAME:}
-spring.mail.password=${MAIL_PASSWORD:}
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 22ae411..182b7a8 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -24,16 +24,17 @@ app.jwt.cookie-name=jwt
 app.jwt.cookie-secure=true
 
 # Invite onboarding settings
-app.invite.frontend-base-url=http://localhost:5173
-app.invite.from-address=no-reply@iksystem.local
-
-# Mail configuration (set in environment or override per profile)
-# spring.mail.host=smtp.example.com
-# spring.mail.port=587
-# spring.mail.username=your-username
-# spring.mail.password=your-password
-# spring.mail.properties.mail.smtp.auth=true
-# spring.mail.properties.mail.smtp.starttls.enable=true
+app.invite.frontend-base-url=${FRONTEND_BASE_URL:http://localhost:5173}
+app.invite.from-address=${MAIL_USERNAME:no-reply@iksystem.local}
+
+# Mail configuration — credentials supplied via MAIL_USERNAME / MAIL_PASSWORD env vars.
+# Leave both blank to disable email (invites won't send, everything else works).
+spring.mail.host=smtp.gmail.com
+spring.mail.port=587
+spring.mail.username=${MAIL_USERNAME:}
+spring.mail.password=${MAIL_PASSWORD:}
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
 
 # Flyway migrations
 spring.flyway.enabled=true