diff --git a/imptune/templates/partials/client_list.html b/imptune/templates/partials/client_list.html
index 4e03dc8..2791eb1 100644
--- a/imptune/templates/partials/client_list.html
+++ b/imptune/templates/partials/client_list.html
@@ -12,7 +12,7 @@
     <tbody>
       {% for c in clients %}
       <tr>
-        <td>{{ c.name }}</td>
+        <td><a href="/clients/{{ c.id }}">{{ c.name }}</a></td>
         <td>{{ c.created_at.strftime('%Y-%m-%d') if c.created_at else '—' }}</td>
       </tr>
       {% endfor %}
diff --git a/imptune/templates/partials/printer_list.html b/imptune/templates/partials/printer_list.html
index c16a2ba..af069ab 100644
--- a/imptune/templates/partials/printer_list.html
+++ b/imptune/templates/partials/printer_list.html
@@ -4,7 +4,12 @@
   {% else %}
   {% for client_name, printers in grouped.items() %}
   <section>
+    {% set group_client_id = printers[0].client_id if printers else None %}
+    {% if group_client_id %}
+    <h3><a href="/clients/{{ group_client_id }}">{{ client_name }}</a></h3>
+    {% else %}
     <h3>{{ client_name }}</h3>
+    {% endif %}
     <table>
       <thead>
         <tr>