diff --git a/app/models/person.rb b/app/models/person.rb
index c06bf74..561b3c5 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -196,7 +196,7 @@ class Person < Profile
 
   def email_addresses
     # TODO for now, only one e-mail address
-    ['%s@%s' % [self.identifier, self.environment.default_hostname(true) ] ]
+    ['%s@%s' % [self.identifier, (self.preferred_domain ? self.preferred_domain.name : self.environment.default_hostname(true)) ] ]
   end
 
   def display_info_to?(user)
--
libgit2 0.21.2