diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties b/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
index ff157a8ed..f567733ea 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
@@ -26,7 +26,8 @@ application.timestamp=EEE, d MMM yyyy HH:mm:ss Z
 # Email Settings
 
 # All emails sent by the system will be from the following user name (used in conjunction with address)
-email.from.name=Unconfigured Archiva Admin Username
+email.from.address=archiva@localhost
+email.from.name=Archiva Administrator
 
 # The subject line for the email message.
 email.validation.subject=Welcome to Maven Archiva