diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d4afb668eddd2e4b1e576bc118b928599009c08f..7e8ed0c346bfca6186ce078cf2ceb92692128e79 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,7 +15,7 @@ spring.http.log-request-details=true
 #     administrator mail is comma-separated list of email addresses
 naming.mail.administrator=${NAMING_MAIL_ADMINISTRATOR:}
 naming.mail.notification=${NAMING_MAIL_NOTIFICATION:false}
-naming.mail.from=${NAMING_MAIL_FROM:jboss@esss.se}
+naming.mail.from=${NAMING_MAIL_FROM:jboss@ess.eu}
 naming.smtp.host=${NAMING_SMTP_HOST:mail.esss.lu.se}
 naming.smtp.port=${NAMING_SMTP_PORT:587}
 naming.smtp.username=${NAMING_SMTP_USERNAME:}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 1fb2f0f68da233990cc80aa2b05c950922d2eae4..e2b0a0945983aa1ee37313b0bac935ed184adb7a 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -15,7 +15,7 @@ spring.http.log-request-details=true
 #     administrator mail is comma-separated list of email addresses
 naming.mail.administrator=${NAMING_MAIL_ADMINISTRATOR:}
 naming.mail.notification=${NAMING_MAIL_NOTIFICATION:false}
-naming.mail.from=${NAMING_MAIL_FROM:jboss@esss.se}
+naming.mail.from=${NAMING_MAIL_FROM:jboss@ess.eu}
 naming.smtp.host=${NAMING_SMTP_HOST:mail.esss.lu.se}
 naming.smtp.port=${NAMING_SMTP_PORT:587}
 naming.smtp.username=${NAMING_SMTP_USERNAME:}