diff --git a/templates/partials/packages/details.html b/templates/partials/packages/details.html
index e0eda54c..771b311d 100644
--- a/templates/partials/packages/details.html
+++ b/templates/partials/packages/details.html
@@ -108,7 +108,7 @@
     <tr class="pkgmaint">
         <th>{{ "Maintainer" | tr }}:</th>
         <td>
-            {% if pkgbase.Maintainer %}
+            {% if request.user.is_authenticated() and pkgbase.Maintainer %}
                 <a href="/account/{{ pkgbase.Maintainer.Username }}">
                     {{ pkgbase.Maintainer.Username }}
                 </a>
@@ -118,6 +118,9 @@
                 {% endif %}
             {% else %}
                 {{ pkgbase.Maintainer.Username | default("None" | tr) }}
+                {% if comaintainers %}
+		     ({{ comaintainers|join(', ') }})
+                {% endif %}
             {% endif %}
         </td>
     </tr>
diff --git a/test/test_pkgbase_routes.py b/test/test_pkgbase_routes.py
index a152c590..dae43e37 100644
--- a/test/test_pkgbase_routes.py
+++ b/test/test_pkgbase_routes.py
@@ -272,9 +272,9 @@ def test_pkgbase_maintainer(client: TestClient, user: User, maintainer: User,
     root = parse_root(resp.text)
 
     maint = root.xpath('//table[@id="pkginfo"]/tr[@class="pkgmaint"]/td')[0]
-    maint, comaint = maint.xpath('./a')
-    assert maint.text.strip() == maintainer.Username
-    assert comaint.text.strip() == user.Username
+    maint, comaint = maint.text.strip().split()
+    assert maint == maintainer.Username
+    assert comaint == f'({user.Username})'
 
 
 def test_pkgbase_voters(client: TestClient, tu_user: User, package: Package):