diff --git a/magstock/templates/forms/attendee/admin_consents.html b/magstock/templates/forms/attendee/admin_consents.html
index 6d91cb6..5d24f39 100644
--- a/magstock/templates/forms/attendee/admin_consents.html
+++ b/magstock/templates/forms/attendee/admin_consents.html
@@ -3,11 +3,20 @@
 {% block required %}
 {{ super() }}
 
-{{ form_macros.form_input(consents.acknowledged_checkin_policy, force_hidden=True)}}
-{{ form_macros.form_input(consents.waiver_consent, force_hidden=True)}}
+{% set allow_waiver_signature = not consents.waiver_signature or attendee.is_new or attendee.placeholder %}
 
-<div class="row g-sm-3">
-    <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_signature, readonly=True) }}</div>
-    <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_date, readonly=True) }}</div>
-</div>
+{% if allow_waiver_signature %}
+    <div class="row g-sm-3">
+        <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_signature) }}</div>
+        <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_date) }}</div>
+    </div>
+{% else %}
+    {{ form_macros.form_input(consents.acknowledged_checkin_policy, force_hidden=True)}}
+    {{ form_macros.form_input(consents.waiver_consent, force_hidden=True)}}
+
+    <div class="row g-sm-3">
+        <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_signature, readonly=True) }}</div>
+        <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_date, readonly=True) }}</div>
+    </div>
+{% endif %}
 {% endblock %}
\ No newline at end of file