diff --git a/conf/xwiki.properties b/conf/xwiki.properties
index 1d0091f..f185673 100644
--- a/conf/xwiki.properties
+++ b/conf/xwiki.properties
@@ -1053,7 +1053,7 @@ __DISTRIBUTION_DEFAULT_UI__
 #-# [Since 6.1M2]
 #-# SMTP host when sending emails, defaults to "localhost".
 #-# This configuration property can be overridden in XWikiPreferences objects, by using the "smtp_server" property name.
-mail.sender.host = __DOMAIN__
+mail.sender.host = localhost
 
 #-# [Since 6.1M2]
 #-# SMTP port when sending emails, defaults to 25.
@@ -1069,7 +1069,7 @@ mail.sender.from = __APP__@__DOMAIN__
 #-# Username to authenticate on the SMTP server, if needed. By default no authentication is performed.
 #-# This configuration property can be overridden in XWikiPreferences objects, by using the "smtp_server_username"
 #-# property name.
-mail.sender.username =  __APP__
+mail.sender.username = __APP__
 
 #-# [Since 6.1M2]
 #-# Password to authenticate on the SMTP server, if needed. By default no authentication is performed.