diff --git a/webtools/bugzilla/Bugzilla/User.pm b/webtools/bugzilla/Bugzilla/User.pm
index 21585b3a4a8..5c9b80c072f 100644
--- a/webtools/bugzilla/Bugzilla/User.pm
+++ b/webtools/bugzilla/Bugzilla/User.pm
@@ -136,7 +136,7 @@ sub _create {
 # Accessors for user attributes
 sub id { $_[0]->{id}; }
 sub login { $_[0]->{login}; }
-sub email { $_[0]->{login}; }
+sub email { $_[0]->{login} . Param('emailsuffix'); }
 sub name { $_[0]->{name}; }
 sub showmybugslink { $_[0]->{showmybugslink}; }
 
@@ -153,8 +153,8 @@ sub get_flag {
     return $self->{'flags'}->{$key};
 }
 
-# Generate a string to identify the user by name + email if the user
-# has a name or by email only if she doesn't.
+# Generate a string to identify the user by name + login if the user
+# has a name or by login only if she doesn't.
 sub identity {
     my $self = shift;