diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index c7a3848f8..e051366a3 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -3,6 +3,7 @@
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
+{% load person_filters %}
 
 {% block pagehead %}
   <link rel="alternate" type="application/atom+xml" title="Document changes" href="/feed/document-changes/{{ name }}/">
@@ -72,10 +73,16 @@
         <th>Author{{doc.authors|pluralize}}</th>
         <td class="edit"></td>
         <td>
+          {# Implementation that uses the current primary email for each author #}
           {% for author in doc.authors %}
-             <a href="{% url 'ietf.person.views.profile' email_or_name=author.email %}">{{ author.plain_name }}</a>
-             {% if not forloop.last %}, {% endif %}
+             {% person_link author %}{% if not forloop.last %}, {% endif %}
           {% endfor %}
+          {% comment %}
+          {# Alternative implementation that uses the submission email (which might have turned invalid #}
+          {% for author in doc.documentauthor_set.all %}
+             {% email_person_link author.email %}{% if not forloop.last %}, {% endif %}
+          {% endfor %}
+          {% endcomment %}
         </td>
       </tr>
 
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index 26b21a803..cc3c12f2f 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -1,4 +1,5 @@
 {# Copyright The IETF Trust 2017, All Rights Reserved #}{% load origin bootstrap3 %}{% origin %}
+{% load person_filters %}
   <table class="table table-condensed">
     <tbody class="meta">
       <tr>
@@ -127,10 +128,7 @@
 	<th>{% if forloop.first %}Assignment{{assignments|pluralize}}{% endif %}</th>
 	<th>Reviewer</th>
 	<td>
-	  <a href="{% url 'ietf.person.views.profile' email_or_name=assignment.reviewer.person.name %}"><b>{{ assignment.reviewer.person.plain_name }}</b></a>
-	  <a href="mailto:{{ assignment.reviewer.address }}"><span class="fa fa-envelope-o tiny"></span></a>
-
-
+          <strong>{% person_link assignment.reviewer.person %}</strong>
 
 	  {% if assignment.can_reject_reviewer_assignment or assignment.can_accept_reviewer_assignment %}
 	  <div class="reviewer-assignment-not-accepted">