diff --git a/castellum/contacts/templates/contacts/__contact.html b/castellum/contacts/templates/contacts/__contact.html
index fb82f124bae12076cd8fe069af48e3a7724b50f6..23fc2a0ffdfdab87dc430482cdbaf1c3c5ce1e02 100644
--- a/castellum/contacts/templates/contacts/__contact.html
+++ b/castellum/contacts/templates/contacts/__contact.html
@@ -1,35 +1,38 @@
 {% load i18n auth utils reliability %}
 
+<dl class="row">
+    <dt class="col-sm-6">{% translate "Reliability" %}</dt>
+    <dd class="col-sm-6">
+        <span class="text-{{ subject|reliability_level }}" aria-hidden="true">&#9679;</span>
+        {% with summary=subject|reliability_summary %}
+            {% if summary %}({{ summary }}){% endif %}
+        {% endwith %}
+    </dd>
+
+    {# also show not_available_until if it should have been set on guardians #}
+    {% if not subject.is_available and subject.contact.guardians.exists %}
+        <dt class="col-sm-6">{% translate "Currently available" %}</dt>
+        <dd class="col-sm-6">
+            {% translate "No" %}
+            <span class="list-icon bg-warning text-dark">{% icon 'phone' %}</span>
+            {% blocktranslate with next_available=subject.not_available_until %}
+                (not until {{ next_available }})
+            {% endblocktranslate %}
+        </dd>
+    {% endif %}
+</dl>
+
 {% for guardian in subject.contact.guardians.all %}
+    <hr>
     {% has_privacy_level guardian.subject.privacy_level user as can_access %}
     {% if can_access %}
-        <dl class="row mb-0">
-            <dt class="col-sm-6">{% translate 'Legal guardian' %}</dt>
-            <dd class="col-sm-6">
-                {{ guardian.full_name }}
-                {% if guardian.guardian_of.count > 1 %}
-                    {% icon 'users' label=_('This guardian has other wards who may also be suitable for this study.') %}
-                {% endif %}
-            </dd>
-        </dl>
-        {% include 'contacts/__contact_detail.html' with contact=guardian %}
+        {% include 'contacts/__contact_detail.html' with contact=guardian guardian=True %}
     {% else %}
         <dl class="row">
             <dt class="col-sm-6 text-muted">{% translate 'Legal guardian' %}</dt>
             <dd class="col-sm-6 text-muted">{% translate 'Insufficient privacy level' %}</dd>
         </dl>
     {% endif %}
-    <hr>
 {% empty %}
     {% include 'contacts/__contact_detail.html' with contact=subject.contact %}
 {% endfor %}
-
-<dl class="row">
-    <dt class="col-sm-6">{% translate "Reliability" %}</dt>
-    <dd class="col-sm-6">
-        <span class="text-{{ subject|reliability_level }}" aria-hidden="true">&#9679;</span>
-        {% with summary=subject|reliability_summary %}
-            {% if summary %}({{ summary }}){% endif %}
-        {% endwith %}
-    </dd>
-</dl>
diff --git a/castellum/contacts/templates/contacts/__contact_detail.html b/castellum/contacts/templates/contacts/__contact_detail.html
index a2c6a98e7ddce1a1b5d49d1b137cdb7c1af9e31e..2799289a39065511b97acd27d43a54874e839446 100644
--- a/castellum/contacts/templates/contacts/__contact_detail.html
+++ b/castellum/contacts/templates/contacts/__contact_detail.html
@@ -1,6 +1,18 @@
 {% load i18n utils %}
 
+<h3 class="h5">{% translate 'Contact data' %}</h3>
+
 <dl class="row">
+    {% if guardian %}
+        <dt class="col-sm-6">{% translate 'Legal guardian' %}</dt>
+        <dd class="col-sm-6">
+            {{ contact.full_name }}
+            {% if contact.guardian_of.count > 1 %}
+                {% icon 'users' label=_('This guardian has other wards who may also be suitable for this study.') %}
+            {% endif %}
+        </dd>
+    {% endif %}
+
     <dt class="col-sm-6">{{ contact|verbose_name:'email' }}</dt>
     <dd class="col-sm-6">
         <a {% if contact.email %}href="mailto:{{ contact.email }}"{% endif %}>{{ contact|display:'email' }}</a>