diff --git a/scipost/templates/scipost/claim_authorships.html b/scipost/templates/scipost/claim_authorships.html
index fb2e0c33e2e71e2324c4a015978d83539ed48cae..2554bd2ed89b73fde73120e1ff6720ae69f5d8e0 100644
--- a/scipost/templates/scipost/claim_authorships.html
+++ b/scipost/templates/scipost/claim_authorships.html
@@ -63,7 +63,7 @@
     <h3>Potential authorships to claim (auto-detected)</h3>
     <ul>
       {% for thesis in thesis_authorships_to_claim %}
-        {{ thesis.header_as_li }}
+        {% include 'theses/_thesislink_header_as_li.html' with thesislink=thesis %}
         <form action="{% url 'scipost:claim_thesis_authorship' thesis_id=thesis.id claim=1%}" method="post">
           {% csrf_token %}
           <input type="submit" value="I am an author" />
diff --git a/scipost/templates/scipost/contributor_info.html b/scipost/templates/scipost/contributor_info.html
index 1f6bde0d3035145732ad6f9b7d3629764ec66bb2..be6f2d0bbbafb4e05494ee4c822a85d8c8c12dc9 100644
--- a/scipost/templates/scipost/contributor_info.html
+++ b/scipost/templates/scipost/contributor_info.html
@@ -103,7 +103,7 @@
     <h3>Theses for which this Contributor is identified as an author:</h3>
     <ul>
       {% for thesis in contributor_theses %}
-        {{ thesis.header_as_li }}
+        {% include 'theses/_thesislink_header_as_li.html' with thesislink=thesis %}
       {% endfor %}
     </ul>
   </div>
diff --git a/scipost/templates/scipost/list.html b/scipost/templates/scipost/list.html
index 006f57fbfbf18bb2773eeec4e0492de818972547..2ef95a3ddec56248a25e0ace8db3bc053675d9aa 100644
--- a/scipost/templates/scipost/list.html
+++ b/scipost/templates/scipost/list.html
@@ -72,7 +72,8 @@
   <h3>Theses:</h3>
   <ul>
     {% for thesislink in thesislink_search_list %}
-    {{ thesislink.header_as_li }}
+
+        {% include 'theses/_thesislink_header_as_li.html' with thesislink=thesislink %}
     <form action="{% url 'scipost:list_add_element' list_id=list.id type='T' element_id=thesislink.id %}" method="post">
       {% csrf_token %}
       <input class="AddItemToList" type="submit" value="Add"/>
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index be0639c3f23f25eb3ecdcb1df6a6146208ced3f4..151c11eb9e901a98ddaf2ab62aa65d523e5e31aa 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -471,7 +471,7 @@
             <h3>Theses for which you are identified as an author:</h3>
             <ul>
                 {% for thesis in own_thesislinks %}
-                    {{ thesis.header_as_li }}
+                    {% include 'theses/_thesislink_header_as_li.html' with thesislink=thesis %}
                 {% endfor %}
             </ul>
         </div>
diff --git a/scipost/templates/scipost/search.html b/scipost/templates/scipost/search.html
index 419dcf4f430bce230a5541a72dc2719b334ba095..050dbafd542fae2959975c7f27117d6c7cece837 100644
--- a/scipost/templates/scipost/search.html
+++ b/scipost/templates/scipost/search.html
@@ -105,7 +105,7 @@
   <h3>Theses:</h3>
   <ul>
     {% for thesislink in thesislink_search_list %}
-    {{ thesislink.header_as_li }}
+        {% include 'theses/_thesislink_header_as_li.html' with thesislink=thesislink %}
     {% endfor %}
   </ul>
   {% endif %}
diff --git a/scipost/templates/scipost/vet_authorship_claims.html b/scipost/templates/scipost/vet_authorship_claims.html
index a5e85d78262a227608d194e51de695008a351f42..ba894d8b264de40d938f78bc9eb1677f8646f19d 100644
--- a/scipost/templates/scipost/vet_authorship_claims.html
+++ b/scipost/templates/scipost/vet_authorship_claims.html
@@ -27,7 +27,7 @@
     {{ claim.commentary.header_as_li }}
     {% elif claim.thesislink %}
     <h4>Contributor {{ claim.claimant.user.first_name }} {{ claim.claimant.user.last_name }} claims to be an author of Thesis:</h4>
-    {{ claim.thesislink.header_as_li }}
+    {% include 'theses/_thesislink_header_as_li.html' with thesislink=claim.thesislink %}
     {% endif %}
 
     <form action="{% url 'scipost:vet_authorship_claim' claim_id=claim.id claim=1%}" method="post">
diff --git a/theses/templates/theses/_thesislink_information.html b/theses/templates/theses/_thesislink_information.html
index 1c4c0e7592f2d3902dc4273fb1475df1e8ffb962..93c9c91fcfc87b5fad54d1ce52857cb56e446842 100644
--- a/theses/templates/theses/_thesislink_information.html
+++ b/theses/templates/theses/_thesislink_information.html
@@ -12,7 +12,7 @@
         {% if thesislink.author_as_cont.all %}
             {% for author in thesislink.author_as_cont.all %}
                 <td><a href= {% url 'scipost:contributor_info' author.id %}>
-                        author.user.first_name author.user.last_name
+                        {{ author.user.first_name }} {{ author.user.last_name }}
                 </a></td>
             {% endfor %}
         {% else %}