From 8c81c826ecb03208f22d1b2e965328a4732fb658 Mon Sep 17 00:00:00 2001
From: Andy Byers <a.byers@bbk.ac.uk>
Date: Wed, 4 Mar 2026 16:04:19 +0000
Subject: [PATCH] fix: adds pii filter to subtitle blocks.

---
 src/templates/admin/copyediting/add_copyeditor_assignment.html | 2 +-
 src/templates/admin/copyediting/article_copyediting.html       | 2 +-
 src/templates/admin/copyediting/delete_author_review.html      | 2 +-
 src/templates/admin/copyediting/edit_assignment.html           | 2 +-
 src/templates/admin/copyediting/editor_review.html             | 2 +-
 .../admin/copyediting/notify_copyeditor_assignment.html        | 2 +-
 src/templates/admin/copyediting/request_author_copyedit.html   | 2 +-
 src/templates/admin/elements/article_title_sub.html            | 1 +
 src/templates/admin/elements/article_title_sub_pii.html        | 1 +
 src/templates/admin/journal/document_management.html           | 2 +-
 src/templates/admin/journal/publish_article.html               | 2 +-
 src/templates/admin/production/assigned_article.html           | 2 +-
 src/templates/admin/production/edit_galley.html                | 2 +-
 src/templates/admin/production/edit_typesetter_assignment.html | 2 +-
 src/templates/admin/production/non_workflow_assign.html        | 2 +-
 src/templates/admin/production/notify_typesetter.html          | 2 +-
 src/templates/admin/production/typeset_task.html               | 2 +-
 src/templates/admin/proofing/acknowledge.html                  | 2 +-
 src/templates/admin/proofing/complete_proofing.html            | 2 +-
 src/templates/admin/proofing/delete_proofing_round.html        | 2 +-
 src/templates/admin/proofing/edit_proofing_assignment.html     | 2 +-
 src/templates/admin/proofing/notify_proofreader.html           | 2 +-
 src/templates/admin/proofing/notify_typesetter_changes.html    | 2 +-
 src/templates/admin/proofing/proofing_article.html             | 2 +-
 src/templates/admin/proofing/request_typesetting_changes.html  | 2 +-
 .../admin/proofing/typesetting/typesetting_corrections.html    | 2 +-
 src/templates/admin/review/add_files.html                      | 2 +-
 src/templates/admin/review/add_review_assignment.html          | 2 +-
 src/templates/admin/review/assignment_notification.html        | 2 +-
 src/templates/admin/review/decision.html                       | 2 +-
 src/templates/admin/review/decision_helper.html                | 2 +-
 src/templates/admin/review/delete_review.html                  | 2 +-
 src/templates/admin/review/draft_decision.html                 | 2 +-
 src/templates/admin/review/edit_review.html                    | 2 +-
 src/templates/admin/review/edit_review_answer.html             | 2 +-
 src/templates/admin/review/in_review.html                      | 2 +-
 src/templates/admin/review/notify_reviewer.html                | 2 +-
 src/templates/admin/review/projected_issue.html                | 2 +-
 src/templates/admin/review/rate_reviewer.html                  | 2 +-
 src/templates/admin/review/reset.html                          | 2 +-
 src/templates/admin/review/review_warning.html                 | 2 +-
 src/templates/admin/review/revision/edit_revision_request.html | 2 +-
 src/templates/admin/review/revision/request_revisions.html     | 2 +-
 .../admin/review/revision/request_revisions_notification.html  | 2 +-
 src/templates/admin/review/revision/view_revision.html         | 2 +-
 src/templates/admin/review/send_review_reminder.html           | 2 +-
 src/templates/admin/review/unassign_editor.html                | 2 +-
 src/templates/admin/review/unassigned_article.html             | 2 +-
 src/templates/admin/review/view_review.html                    | 3 +--
 src/templates/admin/review/withdraw_review.html                | 2 +-
 50 files changed, 50 insertions(+), 49 deletions(-)
 create mode 100644 src/templates/admin/elements/article_title_sub.html
 create mode 100644 src/templates/admin/elements/article_title_sub_pii.html

diff --git a/src/templates/admin/copyediting/add_copyeditor_assignment.html b/src/templates/admin/copyediting/add_copyeditor_assignment.html
index 4af73640ad..9988f7fce2 100644
--- a/src/templates/admin/copyediting/add_copyeditor_assignment.html
+++ b/src/templates/admin/copyediting/add_copyeditor_assignment.html
@@ -4,7 +4,7 @@
 
 {% block title %}Add Copyeditor{% endblock %}
 {% block title-section %}Add Copyeditor{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/copyediting/article_copyediting.html b/src/templates/admin/copyediting/article_copyediting.html
index e1b830af45..e6f62f2d35 100644
--- a/src/templates/admin/copyediting/article_copyediting.html
+++ b/src/templates/admin/copyediting/article_copyediting.html
@@ -3,7 +3,7 @@
 
 {% block title %}Copyediting {{ article.title }}{% endblock %}
 {% block title-section %}Copyediting{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/copyediting/delete_author_review.html b/src/templates/admin/copyediting/delete_author_review.html
index 4e99edc817..aef177165e 100644
--- a/src/templates/admin/copyediting/delete_author_review.html
+++ b/src/templates/admin/copyediting/delete_author_review.html
@@ -5,7 +5,7 @@
 {% block title-section %}
     Delete Author Copyedit Request #{{ author_review.id }}
 {% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/copyediting/edit_assignment.html b/src/templates/admin/copyediting/edit_assignment.html
index d30c415a36..115eb7ce4d 100644
--- a/src/templates/admin/copyediting/edit_assignment.html
+++ b/src/templates/admin/copyediting/edit_assignment.html
@@ -3,7 +3,7 @@
 
 {% block title %}Edit Assignment{% endblock %}
 {% block title-section %}Edit Assignment{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/copyediting/editor_review.html b/src/templates/admin/copyediting/editor_review.html
index 65f4e46548..dfdccc8c59 100644
--- a/src/templates/admin/copyediting/editor_review.html
+++ b/src/templates/admin/copyediting/editor_review.html
@@ -4,7 +4,7 @@
 {% block title %}Editor Review Copyedit{% endblock %}
 {% block title-section %}Review Copyedit Assignment #{{ copyedit.id }} by
     {{ copyedit.copyeditor.full_name }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/copyediting/notify_copyeditor_assignment.html b/src/templates/admin/copyediting/notify_copyeditor_assignment.html
index 9accec1e4d..070262d808 100644
--- a/src/templates/admin/copyediting/notify_copyeditor_assignment.html
+++ b/src/templates/admin/copyediting/notify_copyeditor_assignment.html
@@ -5,7 +5,7 @@
 
 {% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
 {% block title %}Editor Assignment Notification{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block body %}
 
diff --git a/src/templates/admin/copyediting/request_author_copyedit.html b/src/templates/admin/copyediting/request_author_copyedit.html
index cd42c9a081..6acd48891d 100644
--- a/src/templates/admin/copyediting/request_author_copyedit.html
+++ b/src/templates/admin/copyediting/request_author_copyedit.html
@@ -5,7 +5,7 @@
 {% block title-section %}
     Request Author Copyedit #{{ author_review.id }}
 {% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/elements/article_title_sub.html b/src/templates/admin/elements/article_title_sub.html
new file mode 100644
index 0000000000..4cd9220efd
--- /dev/null
+++ b/src/templates/admin/elements/article_title_sub.html
@@ -0,0 +1 @@
+#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}
\ No newline at end of file
diff --git a/src/templates/admin/elements/article_title_sub_pii.html b/src/templates/admin/elements/article_title_sub_pii.html
new file mode 100644
index 0000000000..e92e5301b8
--- /dev/null
+++ b/src/templates/admin/elements/article_title_sub_pii.html
@@ -0,0 +1 @@
+{% load securitytags %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}
\ No newline at end of file
diff --git a/src/templates/admin/journal/document_management.html b/src/templates/admin/journal/document_management.html
index 34d843fbbc..11f9d4dd56 100644
--- a/src/templates/admin/journal/document_management.html
+++ b/src/templates/admin/journal/document_management.html
@@ -6,7 +6,7 @@
 
 {% block title %}Article Document Management{% endblock title %}
 {% block title-section %}Article Document Management{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block body %}
     {% csrf_token %}
diff --git a/src/templates/admin/journal/publish_article.html b/src/templates/admin/journal/publish_article.html
index c2ba422e81..4be397cf12 100644
--- a/src/templates/admin/journal/publish_article.html
+++ b/src/templates/admin/journal/publish_article.html
@@ -10,7 +10,7 @@
 {% endblock css %}
 {% block title %}Pre Publication - {{ article.pk }}{% endblock title %}
 {% block title-section %}Pre Publication Checklist{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/production/assigned_article.html b/src/templates/admin/production/assigned_article.html
index 191c313143..06bdbac993 100644
--- a/src/templates/admin/production/assigned_article.html
+++ b/src/templates/admin/production/assigned_article.html
@@ -8,7 +8,7 @@
 
 {% block title %}Article Production{% endblock title %}
 {% block admin-header %}}Article Production{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/production/edit_galley.html b/src/templates/admin/production/edit_galley.html
index 86bd1dd083..d15355e083 100644
--- a/src/templates/admin/production/edit_galley.html
+++ b/src/templates/admin/production/edit_galley.html
@@ -5,7 +5,7 @@
 
 {% block title %}Edit Galley - {{ galley.pk }}{% endblock title %}
 {% block title-section %}Edit Galley - {{ galley.pk }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/production/edit_typesetter_assignment.html b/src/templates/admin/production/edit_typesetter_assignment.html
index 6d714550da..c17d523711 100644
--- a/src/templates/admin/production/edit_typesetter_assignment.html
+++ b/src/templates/admin/production/edit_typesetter_assignment.html
@@ -5,7 +5,7 @@
     {{ typeset.typesetter.full_name }}{% endblock %}
 {% block title-section %}#{{ typeset.pk }} -
     {{ typeset.typesetter.full_name }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/production/non_workflow_assign.html b/src/templates/admin/production/non_workflow_assign.html
index 719e4b556b..47ee19e350 100644
--- a/src/templates/admin/production/non_workflow_assign.html
+++ b/src/templates/admin/production/non_workflow_assign.html
@@ -6,7 +6,7 @@
 
 {% block title %}Article - {{ article.pk }}{% endblock title %}
 {% block admin-header %}Article - {{ article.pk }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/production/notify_typesetter.html b/src/templates/admin/production/notify_typesetter.html
index aeb50b8328..85ec1efc5c 100644
--- a/src/templates/admin/production/notify_typesetter.html
+++ b/src/templates/admin/production/notify_typesetter.html
@@ -3,7 +3,7 @@
 
 {% block title %}Notify Typesetter{% endblock title %}
 {% block title-section %}Notify Typesetter{% endblock %}}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/production/typeset_task.html b/src/templates/admin/production/typeset_task.html
index e97d1dddc0..1f15c3189e 100644
--- a/src/templates/admin/production/typeset_task.html
+++ b/src/templates/admin/production/typeset_task.html
@@ -6,7 +6,7 @@
 
 {% block title %}Typeset Task - {{ typeset_task.pk }}{% endblock title %}
 {% block title-section %}Typeset Task - {{ typeset_task.pk }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/acknowledge.html b/src/templates/admin/proofing/acknowledge.html
index d44e4528be..59503d6003 100644
--- a/src/templates/admin/proofing/acknowledge.html
+++ b/src/templates/admin/proofing/acknowledge.html
@@ -3,7 +3,7 @@
 
 {% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
 {% block title %}Acknowledge Task{% endblock title %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}  
diff --git a/src/templates/admin/proofing/complete_proofing.html b/src/templates/admin/proofing/complete_proofing.html
index 8cb5cf2117..74e9688e5c 100644
--- a/src/templates/admin/proofing/complete_proofing.html
+++ b/src/templates/admin/proofing/complete_proofing.html
@@ -5,7 +5,7 @@
     <link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
 {% block title %}Complete Proofing{% endblock title %}
 {% block title-section %}Complete Proofing{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/delete_proofing_round.html b/src/templates/admin/proofing/delete_proofing_round.html
index 921f61154e..81e03fb878 100644
--- a/src/templates/admin/proofing/delete_proofing_round.html
+++ b/src/templates/admin/proofing/delete_proofing_round.html
@@ -5,7 +5,7 @@
 
 {% block title %}Deleting Proofing Round #{{ round.number }}{% endblock %}
 {% block title-section %}Deleting Proofing Round #{{ round.number }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/edit_proofing_assignment.html b/src/templates/admin/proofing/edit_proofing_assignment.html
index 0779d5fbe9..bcda67fcaf 100644
--- a/src/templates/admin/proofing/edit_proofing_assignment.html
+++ b/src/templates/admin/proofing/edit_proofing_assignment.html
@@ -5,7 +5,7 @@
 
 {% block title %}#{{ proofing_task.pk }} - {{ proofing_task.proofreader.full_name }}{% endblock %}
 {% block title-section %}#{{ proofing_task.pk }} - {{ proofing_task.proofreader.full_name }}{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/notify_proofreader.html b/src/templates/admin/proofing/notify_proofreader.html
index bcb58beebe..4046170176 100644
--- a/src/templates/admin/proofing/notify_proofreader.html
+++ b/src/templates/admin/proofing/notify_proofreader.html
@@ -4,7 +4,7 @@
 {% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
 {% block title %}Notify Proofreader{% endblock title %}
 {% block title-section %}Notify Proofreader{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/proofing/notify_typesetter_changes.html b/src/templates/admin/proofing/notify_typesetter_changes.html
index 6ea7c3e20d..87cdc14b3d 100644
--- a/src/templates/admin/proofing/notify_typesetter_changes.html
+++ b/src/templates/admin/proofing/notify_typesetter_changes.html
@@ -4,7 +4,7 @@
 {% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
 {% block title %}Notify Typesetter{% endblock title %}
 {% block admin-header %}Notify Typesetter{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %} 
     {{ block.super }}
diff --git a/src/templates/admin/proofing/proofing_article.html b/src/templates/admin/proofing/proofing_article.html
index e5f2288e10..c67ff66c67 100644
--- a/src/templates/admin/proofing/proofing_article.html
+++ b/src/templates/admin/proofing/proofing_article.html
@@ -9,7 +9,7 @@
 
 {% block title %}Proofing - {{ article.pk }}{% endblock title %}
 {% block title-section %}Proofing{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/request_typesetting_changes.html b/src/templates/admin/proofing/request_typesetting_changes.html
index 92e982eb64..279e855924 100644
--- a/src/templates/admin/proofing/request_typesetting_changes.html
+++ b/src/templates/admin/proofing/request_typesetting_changes.html
@@ -8,7 +8,7 @@
 
 {% block title %}Request Corrections{% endblock title %}
 {% block title-section %}Request Corrections{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/proofing/typesetting/typesetting_corrections.html b/src/templates/admin/proofing/typesetting/typesetting_corrections.html
index e2754a4b45..bbd6dc8b91 100644
--- a/src/templates/admin/proofing/typesetting/typesetting_corrections.html
+++ b/src/templates/admin/proofing/typesetting/typesetting_corrections.html
@@ -6,7 +6,7 @@
 
 {% block title %}Proofing Corrections{% endblock title %}
 {% block title-section %}Proofing Corrections{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/add_files.html b/src/templates/admin/review/add_files.html
index cd8235a7b1..3561bd0eaf 100644
--- a/src/templates/admin/review/add_files.html
+++ b/src/templates/admin/review/add_files.html
@@ -3,7 +3,7 @@
 
 {% block title %}Add Review Files{% endblock title %}
 {% block title-section %}Add Files{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/add_review_assignment.html b/src/templates/admin/review/add_review_assignment.html
index b5ddfe4388..e17baf824e 100644
--- a/src/templates/admin/review/add_review_assignment.html
+++ b/src/templates/admin/review/add_review_assignment.html
@@ -2,7 +2,7 @@
 {% load foundation %}
 {% block title %}Add Review Assignment{% endblock title %}
 {% block title-section %}Add Review Assignment{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/assignment_notification.html b/src/templates/admin/review/assignment_notification.html
index 948c8d85c9..5b701a3eeb 100644
--- a/src/templates/admin/review/assignment_notification.html
+++ b/src/templates/admin/review/assignment_notification.html
@@ -3,7 +3,7 @@
 {% load settings %}
 
 {% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block body %}
 
diff --git a/src/templates/admin/review/decision.html b/src/templates/admin/review/decision.html
index af68a07cc9..4f2f89c272 100644
--- a/src/templates/admin/review/decision.html
+++ b/src/templates/admin/review/decision.html
@@ -3,7 +3,7 @@
 
 {% block title %}{{ decision|capfirst }} Article{% endblock title %}
 {% block title-section %}{{ decision|capfirst }} Article{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/decision_helper.html b/src/templates/admin/review/decision_helper.html
index 02150b0c1c..bbd819bef8 100644
--- a/src/templates/admin/review/decision_helper.html
+++ b/src/templates/admin/review/decision_helper.html
@@ -5,7 +5,7 @@
 
 {% block title %}#{{ article.pk }} Decision Helper{% endblock title %}
 {% block title-section %}#{{ article.pk }} Decision Helper{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/delete_review.html b/src/templates/admin/review/delete_review.html
index 9da5bc8de4..eddd62cc86 100644
--- a/src/templates/admin/review/delete_review.html
+++ b/src/templates/admin/review/delete_review.html
@@ -2,7 +2,7 @@
 
 {% block title %}Delete Review{% endblock title %}
 {% block title-section %}Delete Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/review/draft_decision.html b/src/templates/admin/review/draft_decision.html
index 403063c00c..a08a6235c6 100644
--- a/src/templates/admin/review/draft_decision.html
+++ b/src/templates/admin/review/draft_decision.html
@@ -5,7 +5,7 @@
 
 {% block title %}Draft Decision{% endblock title %}
 {% block admin-header %}Draft Decision{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/edit_review.html b/src/templates/admin/review/edit_review.html
index ed5a402174..8e66b22d2c 100644
--- a/src/templates/admin/review/edit_review.html
+++ b/src/templates/admin/review/edit_review.html
@@ -3,7 +3,7 @@
 
 {% block title %}Edit Review{% endblock title %}
 {% block title-section %}Edit Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/edit_review_answer.html b/src/templates/admin/review/edit_review_answer.html
index 1e1af4c450..73f35ce13b 100644
--- a/src/templates/admin/review/edit_review_answer.html
+++ b/src/templates/admin/review/edit_review_answer.html
@@ -2,7 +2,7 @@
 
 {% block title %}Edit Review Answer{% endblock title %}
 {% block admin-header %}Edit Review Answer{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/in_review.html b/src/templates/admin/review/in_review.html
index e5fb18e5d6..eb6b0e2ffa 100644
--- a/src/templates/admin/review/in_review.html
+++ b/src/templates/admin/review/in_review.html
@@ -4,7 +4,7 @@
 
 {% block title %}Review {{ article.title }}{% endblock %}
 {% block title-section %}Peer Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/notify_reviewer.html b/src/templates/admin/review/notify_reviewer.html
index 4b949be2db..7cf1e94ffe 100644
--- a/src/templates/admin/review/notify_reviewer.html
+++ b/src/templates/admin/review/notify_reviewer.html
@@ -5,7 +5,7 @@
 
 {% block title %}Add Review Assignment{% endblock title %}
 {% block title-section %}Add Review Assignment{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block css %}
     <link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">
diff --git a/src/templates/admin/review/projected_issue.html b/src/templates/admin/review/projected_issue.html
index 1a1a25b1e0..626ce6d4f3 100644
--- a/src/templates/admin/review/projected_issue.html
+++ b/src/templates/admin/review/projected_issue.html
@@ -5,7 +5,7 @@
 
 {% block title %}Projected Issue {{ article.title }}{% endblock %}
 {% block title-section %}Projected Issue{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/rate_reviewer.html b/src/templates/admin/review/rate_reviewer.html
index ae8f9e0ea3..0e1152ed79 100644
--- a/src/templates/admin/review/rate_reviewer.html
+++ b/src/templates/admin/review/rate_reviewer.html
@@ -2,7 +2,7 @@
 
 {% block title %}Rate Reviewer{% endblock title %}
 {% block title-section %}Rate Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/reset.html b/src/templates/admin/review/reset.html
index ccdf7c17ff..fe3ad9164f 100644
--- a/src/templates/admin/review/reset.html
+++ b/src/templates/admin/review/reset.html
@@ -3,7 +3,7 @@
 
 {% block title %}Reset Review{% endblock title %}
 {% block title-section %}Reset Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/review/review_warning.html b/src/templates/admin/review/review_warning.html
index 4314c1c292..6d7ff0e4ff 100644
--- a/src/templates/admin/review/review_warning.html
+++ b/src/templates/admin/review/review_warning.html
@@ -2,7 +2,7 @@
 
 {% block title %}Permission Denied{% endblock title %}
 {% block admin-header %}Permission Denied{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/revision/edit_revision_request.html b/src/templates/admin/review/revision/edit_revision_request.html
index 579fd15fac..41d34f9d6d 100644
--- a/src/templates/admin/review/revision/edit_revision_request.html
+++ b/src/templates/admin/review/revision/edit_revision_request.html
@@ -3,7 +3,7 @@
 
 {% block title %}Edit Revision{% endblock title %}
 {% block title-section %}Edit Revision{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/revision/request_revisions.html b/src/templates/admin/review/revision/request_revisions.html
index f88d1af220..8da5eac56e 100644
--- a/src/templates/admin/review/revision/request_revisions.html
+++ b/src/templates/admin/review/revision/request_revisions.html
@@ -3,7 +3,7 @@
 
 {% block title %}Request Revisions{% endblock title %}
 {% block title-section %}Request Revisions{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/revision/request_revisions_notification.html b/src/templates/admin/review/revision/request_revisions_notification.html
index 09b18448f4..a7f430b0e1 100644
--- a/src/templates/admin/review/revision/request_revisions_notification.html
+++ b/src/templates/admin/review/revision/request_revisions_notification.html
@@ -4,7 +4,7 @@
 
 {% block title %}Request Revisions{% endblock title %}
 {% block title-section %}Request Revisions{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
 {{ block.super }}
diff --git a/src/templates/admin/review/revision/view_revision.html b/src/templates/admin/review/revision/view_revision.html
index e88c5bb421..a1139da257 100644
--- a/src/templates/admin/review/revision/view_revision.html
+++ b/src/templates/admin/review/revision/view_revision.html
@@ -4,7 +4,7 @@
 
 {% block title %}Revision Request{% endblock title %}
 {% block admin-header %}Revision Request{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/send_review_reminder.html b/src/templates/admin/review/send_review_reminder.html
index c9c6458795..107bf44d56 100644
--- a/src/templates/admin/review/send_review_reminder.html
+++ b/src/templates/admin/review/send_review_reminder.html
@@ -3,7 +3,7 @@
 
 {% block title %}Review Reminders{% endblock title %}
 {% block title-section %}Review Reminders{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/unassign_editor.html b/src/templates/admin/review/unassign_editor.html
index 58ccac19bc..52a7dc44db 100644
--- a/src/templates/admin/review/unassign_editor.html
+++ b/src/templates/admin/review/unassign_editor.html
@@ -3,7 +3,7 @@
 
 {% block title %}Unassign Editor Request{% endblock title %}
 {% block title-section %}Unassign Editor Request{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/unassigned_article.html b/src/templates/admin/review/unassigned_article.html
index 0ff9802808..2c289b8b34 100644
--- a/src/templates/admin/review/unassigned_article.html
+++ b/src/templates/admin/review/unassigned_article.html
@@ -3,7 +3,7 @@
 
 {% block title %}Unassigned {{ article.title }}{% endblock %}
 {% block title-section %}Unassigned{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/view_review.html b/src/templates/admin/review/view_review.html
index c178719e96..5d28b05143 100644
--- a/src/templates/admin/review/view_review.html
+++ b/src/templates/admin/review/view_review.html
@@ -5,8 +5,7 @@
 
 {% block title %}View Review{% endblock title %}
 {% block title-section %}View Review{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name|se_can_see_pii:article }} /
-    {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}
diff --git a/src/templates/admin/review/withdraw_review.html b/src/templates/admin/review/withdraw_review.html
index ef4f86c2ea..238c45a927 100644
--- a/src/templates/admin/review/withdraw_review.html
+++ b/src/templates/admin/review/withdraw_review.html
@@ -3,7 +3,7 @@
 
 {% block title %}Withdraw Review Request{% endblock title %}
 {% block title-section %}Withdraw Review Request{% endblock %}
-{% block title-sub %}#{{ article.pk }} / {{ article.correspondence_author.last_name }} / {{ article.safe_title }}{% endblock %}
+{% block title-sub %}{% include "admin/elements/article_title_sub_pii.html" %}{% endblock %}
 
 {% block breadcrumbs %}
     {{ block.super }}