diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index 19cdddfbe573d4e6bbf83580e3ecf70311ed9652..89f725b9a82535c7f15bb1ecd4b86219741e4d21 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -32,21 +32,21 @@
   {% if comment.commentary %}
     <h1>The Commentary concerned:</h1>
     {{ commentary.header_as_table }}
-    
+
     <h3>Abstract:</h3>
     <p>{{ commentary.pub_abstract }}</p>
   {% endif %}
   {% if comment.submission %}
     <h1>The Submission concerned:</h1>
     {{ submission.header_as_table }}
-    
+
     <h3>Abstract:</h3>
     <p>{{ submission.abstract }}</p>
   {% endif %}
   {% if comment.thesislink %}
     <h1>The Thesis concerned:</h1>
-    {{ thesislink.header_as_table }}
-    
+    {% include "theses/_header_as_table.html" with thesislink=thesislink %}
+
     <h3>Abstract:</h3>
     <p>{{ thesislink.abstract }}</p>
   {% endif %}
diff --git a/theses/templates/theses/_header_as_table.html b/theses/templates/theses/_header_as_table.html
index c6f6fb9baf701b09421fbd134b1df676bdf14b1c..2a23414649882e3f50f6d2c1e7788ad254de5099 100644
--- a/theses/templates/theses/_header_as_table.html
+++ b/theses/templates/theses/_header_as_table.html
@@ -2,10 +2,10 @@
 
 <table>
     <tr>
-        <td>Title: </td><td>&nbsp;</td><td>{{ title }}</td>
+        <td>Title: </td><td>&nbsp;</td><td>{{ thesislink.title }}</td>
     </tr>
     <tr>
-        <td>Author: </td><td>&nbsp;</td><td>{{ author }}</td>
+        <td>Author: </td><td>&nbsp;</td><td>{{ thesislink.author }}</td>
     </tr>
     <tr>
         <td>As Contributor: </td><td>&nbsp;</td>
diff --git a/theses/templates/theses/vet_thesislink_requests.html b/theses/templates/theses/vet_thesislink_requests.html
index 2a74df8504794c6fe9d40817694cbe0afbc4b208..49172307273f713a950bb4355acb90c6ab8387ff 100644
--- a/theses/templates/theses/vet_thesislink_requests.html
+++ b/theses/templates/theses/vet_thesislink_requests.html
@@ -16,7 +16,7 @@
   <hr>
   <div class="row">
     <div class="col-8">
-      {{ thesislink_to_vet.header_as_table }}
+      {% include "./_header_as_table.html" with thesislink=thesislink_to_vet %}
       <br />
       <h4>Abstract:</h4>
       <p>{{ thesislink_to_vet.abstract }}</p>