diff --git a/ietf/idtracker/admin.py b/ietf/idtracker/admin.py
index 646238531..259cdda53 100644
--- a/ietf/idtracker/admin.py
+++ b/ietf/idtracker/admin.py
@@ -35,7 +35,7 @@ class DocumentCommentAdmin(admin.ModelAdmin):
 admin.site.register(DocumentComment, DocumentCommentAdmin)
 
 class EmailAddressAdmin(admin.ModelAdmin):
-    list_display=('person_or_org', 'address', 'type', 'priority')
+    list_display=('id', 'person_link', 'address', 'type', 'priority')
     search_fields=['address']
 admin.site.register(EmailAddress, EmailAddressAdmin)
 
diff --git a/ietf/idtracker/models.py b/ietf/idtracker/models.py
index b8d524f6e..401c3f309 100644
--- a/ietf/idtracker/models.py
+++ b/ietf/idtracker/models.py
@@ -9,6 +9,7 @@ from django.db import models
 from ietf.utils import FKAsOneToOne
 from ietf.utils.broken_foreign_key import BrokenForeignKey
 from ietf.utils.cached_lookup_field import CachedLookupField
+from ietf.utils.admin import admin_link
 
 class Acronym(models.Model):
     INDIVIDUAL_SUBMITTER = 1027
@@ -824,6 +825,7 @@ class EmailAddress(models.Model):
     comment = models.CharField(blank=True, null=True, max_length=255, db_column='email_comment')
     def __str__(self):
 	return self.address
+    person_link = admin_link('person_or_org')
     class Meta:
         db_table = 'email_addresses'
 	#unique_together = (('email_priority', 'person_or_org'), )