diff --git a/musician/templates/musician/addresses.html b/musician/templates/musician/addresses.html
index 8d52e06..1ebc8b7 100644
--- a/musician/templates/musician/addresses.html
+++ b/musician/templates/musician/addresses.html
@@ -25,7 +25,7 @@
         <td>{{ obj.domain.name }}</td>
         <td>
           {% for mailbox in obj.mailboxes %}
-            <a href="#TODO-mailbox-detail-{{ mailbox.id }}">{{ mailbox.name }}</a>
+            <a href="{% url 'musician:mailbox-update' mailbox.id %}">{{ mailbox.name }}</a>
             {% if not forloop.last %}<br/> {% endif %}
           {% endfor %}
         </td>
diff --git a/musician/templates/musician/mailbox_form.html b/musician/templates/musician/mailbox_form.html
index 13eb3c3..5fb9465 100644
--- a/musician/templates/musician/mailbox_form.html
+++ b/musician/templates/musician/mailbox_form.html
@@ -21,7 +21,7 @@
   <button type="submit" class="btn btn-secondary">{% trans "Save" %}</button>
   {% if form.instance %}
   <div class="float-right">
-    <a class="btn btn-outline-warning" href="{% url 'musician:mailbox-password' mailbox.id %}"><i class="fas fa-key"></i> {% trans "Change password" %}</a>
+    <a class="btn btn-outline-warning" href="{% url 'musician:mailbox-password' view.kwargs.pk %}"><i class="fas fa-key"></i> {% trans "Change password" %}</a>
     <a class="btn btn-danger" href="{% url 'musician:mailbox-delete' view.kwargs.pk %}">{% trans "Delete" %}</a>
   </div>
   {% endif %}