diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index 988250e6109778bafa6acbb3bcc9a49078f090e5..5d2dceb4dd190722414c21c2adc6983f54c9accd 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -54,7 +54,9 @@
     <table class="table table-borderless">
         <tr>
             <td>{% trans "Who?" %}</td>
-            <td>{{ ak.owners_list }}</td>
+            <td>
+                {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
+            </td>
         </tr>
         <tr>
             <td>{% trans 'Category' %}</td>
diff --git a/AKSubmission/templates/AKSubmission/ak_list_table.html b/AKSubmission/templates/AKSubmission/ak_list_table.html
index aeaf098cba8fc093ce0cc9eaca0056e5b738ac8b..0f22739663c4f8228f944e69e749c1d73a16cb6e 100644
--- a/AKSubmission/templates/AKSubmission/ak_list_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_list_table.html
@@ -17,7 +17,10 @@
     {% for ak in AKs %}
         <tr>
             <td>
-                <b>{{ ak.name }}</b>
+                <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}"
+                      class="text-dark text-decoration-none font-weight-bold">
+                    {{ ak.name }}
+                </a>
                 {% if ak.present %}
                     <span class="badge badge-dark badge-pill"
                           title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
@@ -31,7 +34,7 @@
                 {% if ak.wish %}
                     <span class="badge badge-dark badge-pill">{% trans "AK Wish" %}</span>
                 {% else %}
-                    {{ ak.owners_list }}
+                    {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
                 {% endif %}
             </td>
             <td>{% category_linked_badge ak.category event.slug %}</td>
diff --git a/AKSubmission/templates/AKSubmission/owners_list.html b/AKSubmission/templates/AKSubmission/owners_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..21c36d20f888423e53ff05d49c169e9d32b45183
--- /dev/null
+++ b/AKSubmission/templates/AKSubmission/owners_list.html
@@ -0,0 +1 @@
+{% for owner in owners.all %}{% if not forloop.first %}, {% endif %}{% if owner.link %}<a href="{{ owner.link }}">{{ owner }}</a>{% else %}{{ owner }}{% endif %}{% endfor %}