diff --git a/app/models/person.rb b/app/models/person.rb
index c0b9edb..36d06c3 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -113,4 +113,9 @@ class Person < Profile
 
   has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
 
+  def email_addresses
+    # TODO for now, only one e-mail address
+    ['%s@%s' % [self.identifier, self.environment.default_hostname ] ]
+  end
+
 end
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 882adcb..467a0e8 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -273,5 +273,13 @@ class PersonTest < Test::Unit::TestCase
     AddFriend.create!(:person => p1, :friend => p2)
     assert p1.already_request_friendship?(p2)
   end
+
+  should 'have e-mail addresses' do
+    env = Environment.create!(:name => 'sample env', :domains => [Domain.new(:name => 'somedomain.com')])
+    person = Person.new(:identifier => 'testuser')
+    person.expects(:environment).returns(env)
+
+    assert_equal ['testuser@somedomain.com'], person.email_addresses
+  end
   
 end
--
libgit2 0.21.2