diff --git a/app/templates/postcard_form.html b/app/templates/postcard_form.html
index bdd2eeb..b01b9bb 100644
--- a/app/templates/postcard_form.html
+++ b/app/templates/postcard_form.html
@@ -87,12 +87,16 @@ function toggleFields() {
 }
 toggleFields();
 {% if not postcard %}
-// Auto-fill date fields with today when switching status on new postcards
+// Auto-fill date fields with today on new postcards
 (function() {
     var today = new Date().toISOString().slice(0, 10);
     var sendTime = document.getElementById('input-send-time');
     var receiveTime = document.getElementById('input-receive');
     var statusSel = document.getElementById('status-select');
+    // Fill on page load
+    if (statusSel.value === 'sent' && !sendTime.value) sendTime.value = today;
+    if (statusSel.value === 'received' && !receiveTime.value) receiveTime.value = today;
+    // Fill on status change
     statusSel.addEventListener('change', function() {
         if (this.value === 'sent' && !sendTime.value) sendTime.value = today;
         if (this.value === 'received' && !receiveTime.value) receiveTime.value = today;