diff --git a/deploy.env.template b/deploy.env.template
index 5893c6a..0bdac25 100644
--- a/deploy.env.template
+++ b/deploy.env.template
@@ -40,6 +40,17 @@ EMAIL_SEND_TIMEOUT_SECONDS=20
 # Rotate with: node -e "console.log(require('crypto').randomBytes(32).toString('hex'))"
 DEPLOY_SMOKE_SECRET=ed7261d3d7a5ac0a51e0cfb2bf4e2bd4009503605d2963d3ee766b7e885e76eb
 
+# MYOB integration — optional. When all of MYOB_API_KEY / MYOB_API_SECRET /
+# MYOB_REFRESH_TOKEN / MYOB_COMPANY_FILE_URI are set, the "Also create this
+# client in MYOB" checkbox in the control panel's Add-client modal creates the
+# client as a customer contact in MYOB AccountRight. Leave blank to disable.
+# MYOB_API_KEY=
+# MYOB_API_SECRET=
+# MYOB_REFRESH_TOKEN=
+# MYOB_COMPANY_FILE_URI=https://api.myob.com/accountright/<company-file-guid>
+# MYOB_CF_USERNAME=Administrator
+# MYOB_CF_PASSWORD=
+
 # Security hardening — sensible defaults are in mail_api/config.py.
 # Override only if the public domains change or you need to allow extra origins.
 # CORS_ALLOWED_ORIGINS=https://goodwalk.co.nz,https://www.goodwalk.co.nz,https://clients.goodwalk.co.nz,https://cp.goodwalk.co.nz
diff --git a/deploy.ps1 b/deploy.ps1
index 3303fff..78c540b 100644
--- a/deploy.ps1
+++ b/deploy.ps1
@@ -399,6 +399,7 @@ function Invoke-AllFormSmokeTests {
     dogName                = 'Smoke'
     dogBreed               = 'Test'
     vetName                = 'Dr Smoke'
+    vetAddress             = '2 Vet Rd, Auckland'
     vetPhone               = '+64-00-000-0000'
     emergencyContactName   = 'Smoke Contact'
     emergencyContactPhone  = '+64-00-000-0000'
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index eef65f9..189dad4 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -59,6 +59,13 @@ services:
       TRUSTED_HOSTS: ${TRUSTED_HOSTS:-}
       MAX_REQUEST_BODY_BYTES: ${MAX_REQUEST_BODY_BYTES:-}
       DEPLOY_SMOKE_SECRET: ${DEPLOY_SMOKE_SECRET:-}
+      # MYOB integration (optional — see deploy.env.template).
+      MYOB_API_KEY: ${MYOB_API_KEY:-}
+      MYOB_API_SECRET: ${MYOB_API_SECRET:-}
+      MYOB_REFRESH_TOKEN: ${MYOB_REFRESH_TOKEN:-}
+      MYOB_COMPANY_FILE_URI: ${MYOB_COMPANY_FILE_URI:-}
+      MYOB_CF_USERNAME: ${MYOB_CF_USERNAME:-Administrator}
+      MYOB_CF_PASSWORD: ${MYOB_CF_PASSWORD:-}
       PYTHONUNBUFFERED: '1'
       TZ: ${TZ:-Pacific/Auckland}
     expose:
diff --git a/docker-compose.yml b/docker-compose.yml
index b9b41a5..6ee4c29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,13 @@ services:
       REPLY_TO: ${REPLY_TO:-info@goodwalk.co.nz}
       ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
       DATA_DIR: ${MAIL_API_DATA_DIR:-/app/data}
+      # MYOB integration (optional — see deploy.env.template).
+      MYOB_API_KEY: ${MYOB_API_KEY:-}
+      MYOB_API_SECRET: ${MYOB_API_SECRET:-}
+      MYOB_REFRESH_TOKEN: ${MYOB_REFRESH_TOKEN:-}
+      MYOB_COMPANY_FILE_URI: ${MYOB_COMPANY_FILE_URI:-}
+      MYOB_CF_USERNAME: ${MYOB_CF_USERNAME:-Administrator}
+      MYOB_CF_PASSWORD: ${MYOB_CF_PASSWORD:-}
       TZ: ${TZ:-Pacific/Auckland}
     volumes:
       - mail_api_data:${MAIL_API_DATA_DIR:-/app/data}
diff --git a/mail-api/README.md b/mail-api/README.md
new file mode 100644
index 0000000..f48006b
--- /dev/null
+++ b/mail-api/README.md
@@ -0,0 +1,22 @@
+# Mail API local dev
+
+Use the project virtualenv, not the global Python install. The local environment already resolves compatible `pydantic` and `pydantic-core` versions together.
+
+## Start on Windows PowerShell
+
+```powershell
+cd C:\Users\mattc\gw-svelte\gw-svelte\mail-api
+.\start-dev.ps1
+```
+
+## First-time setup
+
+```powershell
+cd C:\Users\mattc\gw-svelte\gw-svelte\mail-api
+py -3.14 -m venv .venv
+.\.venv\Scripts\python.exe -m pip install -r requirements.txt
+```
+
+## If you see a `pydantic-core` mismatch
+
+You are almost certainly running against a global interpreter or a stale environment. Reinstall into the project virtualenv and start the app with `.\start-dev.ps1`.
diff --git a/mail-api/__pycache__/db.cpython-314.pyc b/mail-api/__pycache__/db.cpython-314.pyc
index 94231e0..19c7cc2 100644
Binary files a/mail-api/__pycache__/db.cpython-314.pyc and b/mail-api/__pycache__/db.cpython-314.pyc differ
diff --git a/mail-api/__pycache__/main.cpython-314.pyc b/mail-api/__pycache__/main.cpython-314.pyc
index 55a85fa..eb563fb 100644
Binary files a/mail-api/__pycache__/main.cpython-314.pyc and b/mail-api/__pycache__/main.cpython-314.pyc differ
diff --git a/mail-api/legacy-clients-seed.json b/mail-api/legacy-clients-seed.json
index fb16ee6..4df5be6 100644
--- a/mail-api/legacy-clients-seed.json
+++ b/mail-api/legacy-clients-seed.json
@@ -207,12 +207,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "27"
       ],
@@ -432,12 +432,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "45"
       ],
@@ -657,12 +657,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "95"
       ],
@@ -882,12 +882,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "103"
       ],
@@ -1107,12 +1107,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "39"
       ],
@@ -1332,12 +1332,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "41"
       ],
@@ -1557,12 +1557,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "36"
       ],
@@ -1782,12 +1782,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "83"
       ],
@@ -2007,12 +2007,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "76",
         "49"
@@ -2233,12 +2233,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "99"
       ],
@@ -2458,12 +2458,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "84"
       ],
@@ -2683,12 +2683,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "51"
       ],
@@ -2908,12 +2908,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "87"
       ],
@@ -3134,12 +3134,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "88"
       ],
@@ -3359,12 +3359,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "34"
       ],
@@ -3584,12 +3584,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "61",
         "47"
@@ -3811,12 +3811,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "57"
       ],
@@ -4036,12 +4036,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "32"
       ],
@@ -4261,12 +4261,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "22"
       ],
@@ -4486,12 +4486,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "64"
       ],
@@ -4711,12 +4711,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "74"
       ],
@@ -4936,12 +4936,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "56"
       ],
@@ -5161,12 +5161,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "116",
         "93"
@@ -5387,12 +5387,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "59"
       ],
@@ -5612,12 +5612,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "30"
       ],
@@ -5837,12 +5837,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "53"
       ],
@@ -6062,12 +6062,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "107"
       ],
@@ -6287,12 +6287,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "24"
       ],
@@ -6512,12 +6512,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "43"
       ],
@@ -6737,12 +6737,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "97"
       ],
@@ -6962,12 +6962,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "90"
       ],
@@ -7188,12 +7188,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "105"
       ],
@@ -7413,12 +7413,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "101"
       ],
@@ -7638,12 +7638,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "78"
       ],
@@ -7664,12 +7664,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [],
       "contractEntryIds": [
         "29"
@@ -7887,12 +7887,12 @@
     "lifecycle": {
       "status": "archived",
       "reason": "Imported from legacy Gravity Forms data",
-      "changedAt": "2026-05-24T05:45:33.160Z",
+      "changedAt": "2026-06-15T21:24:42.302Z",
       "changedBy": "legacy-import"
     },
     "legacy": {
       "source": "gravity-forms-csv",
-      "importedAt": "2026-05-24T05:45:33.160Z",
+      "importedAt": "2026-06-15T21:24:42.302Z",
       "onboardingEntryIds": [
         "80"
       ],
diff --git a/mail-api/logs/mail-api.log b/mail-api/logs/mail-api.log
index 069dd5e..3130fe8 100644
--- a/mail-api/logs/mail-api.log
+++ b/mail-api/logs/mail-api.log
@@ -1437,3 +1437,657 @@ resend.exceptions.ResendError: API key is invalid
 19/05/2026 23:32:40 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
 19/05/2026 23:32:40 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
 19/05/2026 23:37:58 New Zealand Standard Time INFO     mail-api: [e8c74fa0] GET /auth/verify → 401 (2ms)
+15/06/2026 20:01:52 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:01:52 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:01:52 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:01:53 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:01:53 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:01:53 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:05:19 New Zealand Standard Time INFO     mail-api: [ae1b0f7e] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:13 New Zealand Standard Time INFO     mail-api: [faf603f0] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:14 New Zealand Standard Time INFO     mail-api: [dd8ad9b9] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:14 New Zealand Standard Time INFO     mail-api: [3fb682e8] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:14 New Zealand Standard Time INFO     mail-api: [734a08d2] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:14 New Zealand Standard Time INFO     mail-api: [658d0d93] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:15 New Zealand Standard Time INFO     mail-api: [a66b3c9f] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:15 New Zealand Standard Time INFO     mail-api: [28307070] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:06:29 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:06:29 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:06:29 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:06:29 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:06:29 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:06:29 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:06:36 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:06:37 New Zealand Standard Time CRITICAL mail-api: Startup aborted: missing env vars: ['RESEND_API_KEY', 'OWNER_EMAIL']
+15/06/2026 20:06:55 New Zealand Standard Time INFO     mail-api: [78c69f47] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:07:00 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:07:00 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:07:00 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:07:00 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:07:00 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:07:00 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:07:02 New Zealand Standard Time INFO     mail-api: [ccfc7849] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:08:31 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:08:31 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:08:31 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:08:31 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:08:31 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:08:31 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:08:36 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:08:36 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:08:36 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:08:36 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:08:36 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:08:36 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:08:40 New Zealand Standard Time INFO     mail-api: [b2f2b0fc] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:09:25 New Zealand Standard Time ERROR    mail-api: [0f10f6ec] POST /auth/request-code crashed after 3ms
+Traceback (most recent call last):
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 579, in _request_logging_middleware
+    response = await call_next(request)
+               ^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\base.py", line 168, in call_next
+    raise app_exc from app_exc.__cause__ or app_exc.__context__
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\base.py", line 144, in coro
+    await self.app(scope, receive_or_disconnect, send_no_error)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\cors.py", line 88, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\trustedhost.py", line 51, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 546, in __call__
+    await self.app(scope, _wrapped_receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\exceptions.py", line 63, in __call__
+    await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\middleware\asyncexitstack.py", line 18, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 660, in __call__
+    await self.middleware_stack(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 680, in app
+    await route.handle(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 276, in handle
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 134, in app
+    await wrap_app_handling_exceptions(app, request)(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 120, in app
+    response = await f(request)
+               ^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 674, in app
+    raw_response = await run_endpoint_function(
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    ...<3 lines>...
+    )
+    ^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 328, in run_endpoint_function
+    return await dependant.call(**values)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 2474, in auth_request_code
+    body = await request.json()
+           ^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\requests.py", line 264, in json
+    self._json = json.loads(body)
+                 ~~~~~~~~~~^^^^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\__init__.py", line 352, in loads
+    return _default_decoder.decode(s)
+           ~~~~~~~~~~~~~~~~~~~~~~~^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\decoder.py", line 345, in decode
+    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
+               ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\decoder.py", line 361, in raw_decode
+    obj, end = self.scan_once(s, idx)
+               ~~~~~~~~~~~~~~^^^^^^^^
+json.decoder.JSONDecodeError: Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
+15/06/2026 20:09:38 New Zealand Standard Time ERROR    mail-api: [251e2d22] POST /auth/request-code crashed after 1ms
+Traceback (most recent call last):
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 579, in _request_logging_middleware
+    response = await call_next(request)
+               ^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\base.py", line 168, in call_next
+    raise app_exc from app_exc.__cause__ or app_exc.__context__
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\base.py", line 144, in coro
+    await self.app(scope, receive_or_disconnect, send_no_error)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\cors.py", line 88, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\trustedhost.py", line 51, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 546, in __call__
+    await self.app(scope, _wrapped_receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\middleware\exceptions.py", line 63, in __call__
+    await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\middleware\asyncexitstack.py", line 18, in __call__
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 660, in __call__
+    await self.middleware_stack(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 680, in app
+    await route.handle(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\routing.py", line 276, in handle
+    await self.app(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 134, in app
+    await wrap_app_handling_exceptions(app, request)(scope, receive, send)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 120, in app
+    response = await f(request)
+               ^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 674, in app
+    raw_response = await run_endpoint_function(
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    ...<3 lines>...
+    )
+    ^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\fastapi\routing.py", line 328, in run_endpoint_function
+    return await dependant.call(**values)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\main.py", line 2474, in auth_request_code
+    body = await request.json()
+           ^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\gw-svelte\gw-svelte\mail-api\.venv\Lib\site-packages\starlette\requests.py", line 264, in json
+    self._json = json.loads(body)
+                 ~~~~~~~~~~^^^^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\__init__.py", line 352, in loads
+    return _default_decoder.decode(s)
+           ~~~~~~~~~~~~~~~~~~~~~~~^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\decoder.py", line 345, in decode
+    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
+               ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\mattc\AppData\Local\Programs\Python\Python314\Lib\json\decoder.py", line 361, in raw_decode
+    obj, end = self.scan_once(s, idx)
+               ~~~~~~~~~~~~~~^^^^^^^^
+json.decoder.JSONDecodeError: Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
+15/06/2026 20:09:53 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:09:53 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:09:53 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:09:53 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:09:53 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:09:53 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:10:15 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:10:15 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:10:15 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:10:15 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:10:15 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:10:15 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:10:20 New Zealand Standard Time INFO     mail-api: [72b111d2] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:11:27 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:11:27 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:11:27 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:11:27 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:11:27 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:11:27 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:11:38 New Zealand Standard Time INFO     mail-api: [6c351fe3] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:11:45 New Zealand Standard Time INFO     mail-api: [912374c3] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:11:50 New Zealand Standard Time INFO     mail-api: [ca16d00f] POST /auth/request-code → 400 (0ms)
+15/06/2026 20:15:10 New Zealand Standard Time INFO     mail-api: [90835023] auth: code issued for email=info@goodwalk.co.nz
+15/06/2026 20:15:10 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 956187
+15/06/2026 20:15:10 New Zealand Standard Time INFO     mail-api: [90835023] POST /auth/request-code → 200 (11ms)
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [b5f581f9] auth: session created for email=info@goodwalk.co.nz
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [b5f581f9] POST /auth/verify-code → 200 (2ms)
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [9d58963f] GET /auth/verify → 200 (1ms)
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [6efc3cae] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [f8fd2577] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:15:18 New Zealand Standard Time INFO     mail-api: [bd38d327] GET /owner/birthdays → 200 (11ms)
+15/06/2026 20:15:20 New Zealand Standard Time INFO     mail-api: [59319824] GET /auth/verify → 200 (0ms)
+15/06/2026 20:15:20 New Zealand Standard Time INFO     mail-api: [bb2fa1e3] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:15:20 New Zealand Standard Time INFO     mail-api: [a7d68e07] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:15:20 New Zealand Standard Time INFO     mail-api: [3f420d48] GET /owner/birthdays → 200 (2ms)
+15/06/2026 20:15:24 New Zealand Standard Time INFO     mail-api: [9dee7759] GET /auth/verify → 200 (0ms)
+15/06/2026 20:15:24 New Zealand Standard Time INFO     mail-api: [bff1d27d] GET /owner/pending-onboarding → 200 (0ms)
+15/06/2026 20:15:24 New Zealand Standard Time INFO     mail-api: [573299f0] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:15:24 New Zealand Standard Time INFO     mail-api: [c1b2cbca] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:15:31 New Zealand Standard Time INFO     mail-api: [8ca00ff2] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:15:32 New Zealand Standard Time INFO     mail-api: [5d67ac5b] POST /owner/render-message → 200 (3ms)
+15/06/2026 20:16:25 New Zealand Standard Time INFO     mail-api: [a3d3d2d9] GET /owner/activity → 200 (1ms)
+15/06/2026 20:17:24 New Zealand Standard Time INFO     mail-api: [62384e2c] GET /owner/activity → 200 (0ms)
+15/06/2026 20:17:46 New Zealand Standard Time INFO     mail-api: [be53083f] GET /owner/activity → 200 (0ms)
+15/06/2026 20:18:38 New Zealand Standard Time INFO     mail-api: [5f777ef7] GET /owner/activity → 200 (0ms)
+15/06/2026 20:19:19 New Zealand Standard Time INFO     mail-api: [739f25e5] GET /owner/client-enquiry → 200 (8ms)
+15/06/2026 20:19:28 New Zealand Standard Time INFO     mail-api: [e70d718b] GET /owner/activity → 200 (1ms)
+15/06/2026 20:20:46 New Zealand Standard Time INFO     mail-api: [4b64a4ec] GET /owner/activity → 200 (0ms)
+15/06/2026 20:21:06 New Zealand Standard Time INFO     mail-api: [5206327c] GET /auth/verify → 200 (0ms)
+15/06/2026 20:21:06 New Zealand Standard Time INFO     mail-api: [0520fe2c] GET /owner/pending-onboarding → 200 (0ms)
+15/06/2026 20:21:06 New Zealand Standard Time INFO     mail-api: [659bc15b] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:21:06 New Zealand Standard Time INFO     mail-api: [b367235f] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:27:58 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:27:58 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:27:58 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:27:58 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:27:58 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:27:58 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:28:06 New Zealand Standard Time INFO     mail-api: [bc4610f2] GET /owner/message-templates → 401 (2ms)
+15/06/2026 20:28:07 New Zealand Standard Time INFO     mail-api: [0169b9e6] GET /owner/activity → 401 (1ms)
+15/06/2026 20:30:00 New Zealand Standard Time INFO     mail-api: [87be64e8] GET /owner/message-templates → 401 (0ms)
+15/06/2026 20:30:01 New Zealand Standard Time INFO     mail-api: [2822c7c6] GET /owner/activity → 401 (0ms)
+15/06/2026 20:30:09 New Zealand Standard Time INFO     mail-api: [f61a5c74] GET /auth/verify → 401 (1ms)
+15/06/2026 20:31:51 New Zealand Standard Time INFO     mail-api: [ee1b53c2] auth: code issued for email=info@goodwalk.co.nz
+15/06/2026 20:31:51 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 546348
+15/06/2026 20:31:51 New Zealand Standard Time INFO     mail-api: [ee1b53c2] POST /auth/request-code → 200 (2ms)
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [ac46d159] auth: session created for email=info@goodwalk.co.nz
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [ac46d159] POST /auth/verify-code → 200 (1ms)
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [60c7fd10] GET /auth/verify → 200 (0ms)
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [abfa833f] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [71044bf5] GET /owner/pending-onboarding → 200 (3ms)
+15/06/2026 20:32:01 New Zealand Standard Time INFO     mail-api: [2ec29972] GET /owner/birthdays → 200 (6ms)
+15/06/2026 20:32:03 New Zealand Standard Time INFO     mail-api: [6c0a3799] GET /owner/client-onboarding-view → 200 (1ms)
+15/06/2026 20:32:10 New Zealand Standard Time INFO     mail-api: [64cdfdf6] GET /auth/verify → 200 (0ms)
+15/06/2026 20:32:10 New Zealand Standard Time INFO     mail-api: [b8478985] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:32:10 New Zealand Standard Time INFO     mail-api: [d5ec31df] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:32:10 New Zealand Standard Time INFO     mail-api: [0ebeb971] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:32:11 New Zealand Standard Time INFO     mail-api: [3b2f4ee0] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:32:28 New Zealand Standard Time INFO     mail-api: [fdc6a9fa] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:32:53 New Zealand Standard Time INFO     mail-api: [07b910be] GET /auth/verify → 200 (0ms)
+15/06/2026 20:32:53 New Zealand Standard Time INFO     mail-api: [eb7646b6] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:32:53 New Zealand Standard Time INFO     mail-api: [e8b1a226] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:32:53 New Zealand Standard Time INFO     mail-api: [882b2a08] GET /owner/birthdays → 200 (0ms)
+15/06/2026 20:33:23 New Zealand Standard Time INFO     mail-api: [783d78c3] GET /auth/verify → 200 (0ms)
+15/06/2026 20:33:23 New Zealand Standard Time INFO     mail-api: [e8b66a3c] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:33:23 New Zealand Standard Time INFO     mail-api: [020c91d9] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:33:23 New Zealand Standard Time INFO     mail-api: [91679cb8] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:33:28 New Zealand Standard Time INFO     mail-api: [e764f088] GET /owner/client-enquiry → 200 (1ms)
+15/06/2026 20:33:29 New Zealand Standard Time INFO     mail-api: [5089b29e] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:33:34 New Zealand Standard Time INFO     mail-api: [2c30ae12] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:33:34 New Zealand Standard Time INFO     mail-api: [2f086a39] POST /owner/render-message → 200 (2ms)
+15/06/2026 20:33:36 New Zealand Standard Time INFO     mail-api: [c383d4c2] GET /owner/activity → 200 (0ms)
+15/06/2026 20:33:46 New Zealand Standard Time INFO     mail-api: [8ce6215d] GET /auth/verify → 200 (0ms)
+15/06/2026 20:33:46 New Zealand Standard Time INFO     mail-api: [77dd8afc] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:33:46 New Zealand Standard Time INFO     mail-api: [5be1fa50] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:33:46 New Zealand Standard Time INFO     mail-api: [69163ab8] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:34:03 New Zealand Standard Time INFO     mail-api: [ef3c519f] GET /owner/client-enquiry → 200 (0ms)
+15/06/2026 20:34:05 New Zealand Standard Time INFO     mail-api: [d547ff1d] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:36:48 New Zealand Standard Time INFO     mail-api: [0d37e5dc] GET /owner/client-enquiry → 200 (0ms)
+15/06/2026 20:36:50 New Zealand Standard Time INFO     mail-api: [24d3194d] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:37:56 New Zealand Standard Time INFO     mail-api: [1145dc87] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:37:56 New Zealand Standard Time INFO     mail-api: [681ad27d] POST /owner/render-message → 200 (1ms)
+15/06/2026 20:37:57 New Zealand Standard Time INFO     mail-api: [99d12925] GET /owner/activity → 200 (0ms)
+15/06/2026 20:38:16 New Zealand Standard Time INFO     mail-api: [823c2f81] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:38:22 New Zealand Standard Time INFO     mail-api: [1ee7e7fc] GET /owner/client-onboarding-view → 200 (1ms)
+15/06/2026 20:38:37 New Zealand Standard Time INFO     mail-api: [f3eed04b] GET /auth/verify → 200 (0ms)
+15/06/2026 20:38:37 New Zealand Standard Time INFO     mail-api: [2fcb1297] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:38:37 New Zealand Standard Time INFO     mail-api: [f8c4996f] GET /owner/birthdays → 200 (2ms)
+15/06/2026 20:38:37 New Zealand Standard Time INFO     mail-api: [99f8e950] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:38:41 New Zealand Standard Time INFO     mail-api: [9da1e72a] GET /auth/verify → 200 (0ms)
+15/06/2026 20:38:41 New Zealand Standard Time INFO     mail-api: [697cad6a] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:38:41 New Zealand Standard Time INFO     mail-api: [b5c6c30b] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:38:41 New Zealand Standard Time INFO     mail-api: [1c67730b] GET /owner/birthdays → 200 (0ms)
+15/06/2026 20:38:50 New Zealand Standard Time INFO     mail-api: [4b3db25d] GET /auth/verify → 200 (0ms)
+15/06/2026 20:38:50 New Zealand Standard Time INFO     mail-api: [b3feec86] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:38:50 New Zealand Standard Time INFO     mail-api: [f47f7889] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:38:50 New Zealand Standard Time INFO     mail-api: [f15da397] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:38:55 New Zealand Standard Time INFO     mail-api: [65cae4c6] GET /auth/verify → 200 (1ms)
+15/06/2026 20:38:55 New Zealand Standard Time INFO     mail-api: [21ab02ac] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:38:55 New Zealand Standard Time INFO     mail-api: [5a7c1435] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:38:55 New Zealand Standard Time INFO     mail-api: [e64d71b6] GET /owner/birthdays → 200 (2ms)
+15/06/2026 20:39:01 New Zealand Standard Time INFO     mail-api: [251265ca] GET /auth/verify → 200 (0ms)
+15/06/2026 20:39:01 New Zealand Standard Time INFO     mail-api: [40b2e542] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:39:01 New Zealand Standard Time INFO     mail-api: [c9af86f0] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:39:01 New Zealand Standard Time INFO     mail-api: [e9c26722] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:39:13 New Zealand Standard Time INFO     mail-api: [a2afb433] GET /auth/verify → 200 (0ms)
+15/06/2026 20:39:13 New Zealand Standard Time INFO     mail-api: [195ded67] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:39:13 New Zealand Standard Time INFO     mail-api: [212985b9] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:39:13 New Zealand Standard Time INFO     mail-api: [9cdd4476] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:39:23 New Zealand Standard Time INFO     mail-api: [0ba57c08] GET /auth/verify → 200 (0ms)
+15/06/2026 20:39:23 New Zealand Standard Time INFO     mail-api: [6eec0e7f] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:39:23 New Zealand Standard Time INFO     mail-api: [f12a42d6] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:39:23 New Zealand Standard Time INFO     mail-api: [99a199e6] GET /owner/birthdays → 200 (0ms)
+15/06/2026 20:39:39 New Zealand Standard Time INFO     mail-api: [0a1bd987] GET /auth/verify → 200 (0ms)
+15/06/2026 20:39:39 New Zealand Standard Time INFO     mail-api: [261ccb15] GET /owner/pending-onboarding → 200 (0ms)
+15/06/2026 20:39:39 New Zealand Standard Time INFO     mail-api: [ef0c4698] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:39:39 New Zealand Standard Time INFO     mail-api: [819915a2] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:39:57 New Zealand Standard Time INFO     mail-api: [7f594e14] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:39:57 New Zealand Standard Time INFO     mail-api: [99e918ff] POST /owner/render-message → 200 (1ms)
+15/06/2026 20:39:57 New Zealand Standard Time INFO     mail-api: [c387447a] GET /owner/activity → 200 (0ms)
+15/06/2026 20:40:03 New Zealand Standard Time INFO     mail-api: [e225bdd8] GET /owner/activity → 200 (0ms)
+15/06/2026 20:41:27 New Zealand Standard Time INFO     mail-api: [fea1334d] GET /owner/activity → 200 (0ms)
+15/06/2026 20:41:35 New Zealand Standard Time INFO     mail-api: [0476565e] GET /auth/verify → 200 (0ms)
+15/06/2026 20:41:35 New Zealand Standard Time INFO     mail-api: [637f7274] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:41:35 New Zealand Standard Time INFO     mail-api: [e2f2deb3] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:41:35 New Zealand Standard Time INFO     mail-api: [ada6cda9] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:41:40 New Zealand Standard Time INFO     mail-api: [8ed96de9] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:41:40 New Zealand Standard Time INFO     mail-api: [99ebfb37] POST /owner/render-message → 200 (1ms)
+15/06/2026 20:41:43 New Zealand Standard Time INFO     mail-api: [054a22e5] GET /owner/client-onboarding-view → 200 (1ms)
+15/06/2026 20:41:50 New Zealand Standard Time INFO     mail-api: [0331ffb5] GET /auth/verify → 200 (0ms)
+15/06/2026 20:41:50 New Zealand Standard Time INFO     mail-api: [0bfa7c1d] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:41:50 New Zealand Standard Time INFO     mail-api: [7bff5a04] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:41:50 New Zealand Standard Time INFO     mail-api: [b3b90343] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:41:55 New Zealand Standard Time INFO     mail-api: [e7e42f0d] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:42:09 New Zealand Standard Time INFO     mail-api: [06c17820] GET /owner/client-onboarding-view → 200 (0ms)
+15/06/2026 20:42:27 New Zealand Standard Time INFO     mail-api: [fb40d429] GET /auth/verify → 200 (1ms)
+15/06/2026 20:42:27 New Zealand Standard Time INFO     mail-api: [93be80d1] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:42:27 New Zealand Standard Time INFO     mail-api: [aacd6e15] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:42:27 New Zealand Standard Time INFO     mail-api: [1f59b652] GET /owner/birthdays → 200 (2ms)
+15/06/2026 20:42:35 New Zealand Standard Time INFO     mail-api: [f63506a6] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:42:35 New Zealand Standard Time INFO     mail-api: [388261bd] POST /owner/render-message → 200 (1ms)
+15/06/2026 20:42:36 New Zealand Standard Time INFO     mail-api: [b360a242] GET /owner/activity → 200 (1ms)
+15/06/2026 20:42:41 New Zealand Standard Time INFO     mail-api: [158bdb8d] GET /owner/client-enquiry → 200 (0ms)
+15/06/2026 20:48:29 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 20:48:29 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 20:48:29 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 20:48:30 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 20:48:30 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 20:48:30 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 20:49:48 New Zealand Standard Time INFO     mail-api: [545f781f] GET /auth/verify → 401 (2ms)
+15/06/2026 20:52:31 New Zealand Standard Time INFO     mail-api: [7ac75d9d] auth: code issued for email=info@goodwalk.co.nz
+15/06/2026 20:52:31 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 718390
+15/06/2026 20:52:31 New Zealand Standard Time INFO     mail-api: [7ac75d9d] POST /auth/request-code → 200 (2ms)
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [48f12e62] auth: session created for email=info@goodwalk.co.nz
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [48f12e62] POST /auth/verify-code → 200 (2ms)
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [6057c23b] GET /auth/verify → 200 (0ms)
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [96abc272] GET /owner/pending-onboarding → 200 (2ms)
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [92cdf868] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:52:38 New Zealand Standard Time INFO     mail-api: [5fb5fdce] GET /owner/birthdays → 200 (12ms)
+15/06/2026 20:52:50 New Zealand Standard Time INFO     mail-api: [12d01bfe] GET /auth/verify → 200 (1ms)
+15/06/2026 20:52:50 New Zealand Standard Time INFO     mail-api: [3841ff56] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:52:50 New Zealand Standard Time INFO     mail-api: [f920aade] GET /owner/all-clients → 200 (1ms)
+15/06/2026 20:52:50 New Zealand Standard Time INFO     mail-api: [7852a9d2] GET /owner/birthdays → 200 (1ms)
+15/06/2026 20:53:03 New Zealand Standard Time INFO     mail-api: [230b4b2b] GET /auth/verify → 200 (0ms)
+15/06/2026 20:53:03 New Zealand Standard Time INFO     mail-api: [4ba82776] GET /owner/pending-onboarding → 200 (1ms)
+15/06/2026 20:53:03 New Zealand Standard Time INFO     mail-api: [6fefad3f] GET /owner/all-clients → 200 (2ms)
+15/06/2026 20:53:03 New Zealand Standard Time INFO     mail-api: [acb28200] GET /owner/birthdays → 200 (2ms)
+15/06/2026 20:53:22 New Zealand Standard Time INFO     mail-api: [9839fe15] GET /owner/message-templates → 200 (1ms)
+15/06/2026 20:53:22 New Zealand Standard Time INFO     mail-api: [26e12e0e] POST /owner/render-message → 200 (1ms)
+15/06/2026 20:53:23 New Zealand Standard Time INFO     mail-api: [a4614459] GET /owner/activity → 200 (1ms)
+15/06/2026 21:06:24 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:06:24 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:06:24 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:06:24 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:06:24 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:06:24 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:44:37 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:44:37 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:44:37 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:44:37 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:44:37 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:44:37 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:44:45 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:44:45 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:44:45 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:44:45 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:44:45 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:44:45 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:44:56 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:44:56 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:44:56 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:44:56 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:44:56 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:44:56 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:47:36 New Zealand Standard Time INFO     mail-api: [68b31f4e] GET /auth/verify → 401 (2ms)
+15/06/2026 21:47:40 New Zealand Standard Time INFO     mail-api: [b6c5eb6f] auth: code issued for email=info@goodwalk.co.nz
+15/06/2026 21:47:40 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 719493
+15/06/2026 21:47:40 New Zealand Standard Time INFO     mail-api: [b6c5eb6f] POST /auth/request-code → 200 (2ms)
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [d53657f2] auth: session created for email=info@goodwalk.co.nz
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [d53657f2] POST /auth/verify-code → 200 (1ms)
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [f183b75a] GET /auth/verify → 200 (0ms)
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [cb914009] GET /owner/all-clients → 200 (2ms)
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [e4eeae45] GET /owner/pending-onboarding → 200 (2ms)
+15/06/2026 21:47:53 New Zealand Standard Time INFO     mail-api: [05e1416f] GET /owner/birthdays → 200 (9ms)
+15/06/2026 21:47:58 New Zealand Standard Time INFO     mail-api: [bc6b815a] GET /owner/client-onboarding-view → 200 (8ms)
+15/06/2026 21:49:47 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:49:47 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:49:47 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:49:47 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:49:47 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:49:47 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:50:00 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+15/06/2026 21:50:00 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+15/06/2026 21:50:00 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+15/06/2026 21:50:00 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+15/06/2026 21:50:00 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+15/06/2026 21:50:00 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+15/06/2026 21:52:22 New Zealand Standard Time INFO     mail-api: [d28300fe] GET /owner/message-templates → 401 (3ms)
+15/06/2026 21:52:23 New Zealand Standard Time INFO     mail-api: [0ea10897] GET /owner/activity → 401 (1ms)
+15/06/2026 21:52:24 New Zealand Standard Time INFO     mail-api: [82beeffb] GET /owner/message-templates → 401 (0ms)
+15/06/2026 21:52:28 New Zealand Standard Time INFO     mail-api: [d4e90d6f] GET /auth/verify → 401 (1ms)
+16/06/2026 06:29:29 New Zealand Standard Time INFO     mail-api: Logging initialised → console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 06:29:29 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 06:29:29 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 06:29:29 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 06:29:29 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 06:29:29 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 06:30:42 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 06:30:42 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 06:30:42 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 06:30:42 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 06:30:42 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 06:30:42 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 06:31:28 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 06:31:28 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 06:31:28 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 06:31:28 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 06:31:28 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 06:31:28 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 06:38:14 New Zealand Standard Time INFO     mail-api: [48563882] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 06:38:14 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 926365
+16/06/2026 06:38:14 New Zealand Standard Time INFO     mail-api: [48563882] POST /auth/request-code → 200 (3ms)
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [5664ed1d] auth: session created for email=info@goodwalk.co.nz
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [5664ed1d] POST /auth/verify-code → 200 (3ms)
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [0bb03468] GET /auth/verify → 200 (1ms)
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [6f38622c] GET /owner/pending-onboarding → 200 (2ms)
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [3d0c8bcf] GET /owner/all-clients → 200 (10ms)
+16/06/2026 06:38:25 New Zealand Standard Time INFO     mail-api: [0b3eb923] GET /owner/birthdays → 200 (11ms)
+16/06/2026 06:38:49 New Zealand Standard Time INFO     mail-api: [1ea3d806] GET /owner/message-templates → 200 (1ms)
+16/06/2026 06:38:49 New Zealand Standard Time INFO     mail-api: [88793213] POST /owner/render-message → 200 (4ms)
+16/06/2026 06:38:51 New Zealand Standard Time INFO     mail-api: [fb1a9f6e] GET /owner/activity → 200 (1ms)
+16/06/2026 06:40:29 New Zealand Standard Time INFO     mail-api: [31e4240c] GET /owner/client-enquiry → 200 (2ms)
+16/06/2026 06:41:47 New Zealand Standard Time INFO     mail-api: [121f9f98] GET /owner/activity → 200 (0ms)
+16/06/2026 06:44:02 New Zealand Standard Time INFO     mail-api: [5a77951c] GET /auth/verify → 200 (0ms)
+16/06/2026 06:44:02 New Zealand Standard Time INFO     mail-api: [737112c8] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 06:44:02 New Zealand Standard Time INFO     mail-api: [d9a6813f] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:44:02 New Zealand Standard Time INFO     mail-api: [46903a39] GET /owner/birthdays → 200 (2ms)
+16/06/2026 06:45:04 New Zealand Standard Time INFO     mail-api: [a241498f] GET /auth/verify → 200 (0ms)
+16/06/2026 06:45:04 New Zealand Standard Time INFO     mail-api: [a306e4a4] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 06:45:04 New Zealand Standard Time INFO     mail-api: [6e060204] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:45:04 New Zealand Standard Time INFO     mail-api: [58ffe4c7] GET /owner/birthdays → 200 (3ms)
+16/06/2026 06:45:17 New Zealand Standard Time INFO     mail-api: [56c5f41a] GET /auth/verify → 200 (0ms)
+16/06/2026 06:45:17 New Zealand Standard Time INFO     mail-api: [f49f41b6] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 06:45:17 New Zealand Standard Time INFO     mail-api: [bd4fd420] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:45:17 New Zealand Standard Time INFO     mail-api: [d4b0ada0] GET /owner/birthdays → 200 (2ms)
+16/06/2026 06:50:33 New Zealand Standard Time INFO     mail-api: [e2163ae1] GET /owner/client-enquiry → 200 (0ms)
+16/06/2026 06:51:46 New Zealand Standard Time INFO     mail-api: [16d4acbc] GET /owner/message-templates → 200 (1ms)
+16/06/2026 06:51:46 New Zealand Standard Time INFO     mail-api: [049712df] POST /owner/render-message → 200 (1ms)
+16/06/2026 06:51:47 New Zealand Standard Time INFO     mail-api: [ff1f1f13] GET /owner/activity → 200 (0ms)
+16/06/2026 06:52:05 New Zealand Standard Time INFO     mail-api: [e3758e0f] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:52:51 New Zealand Standard Time INFO     mail-api: [80d0c427] GET /owner/activity → 200 (0ms)
+16/06/2026 06:54:39 New Zealand Standard Time INFO     mail-api: [ae3c4fd3] GET /owner/activity → 200 (1ms)
+16/06/2026 06:55:26 New Zealand Standard Time INFO     mail-api: [d6b285f1] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:55:30 New Zealand Standard Time INFO     mail-api: [24446f12] GET /owner/client-enquiry → 200 (0ms)
+16/06/2026 06:55:43 New Zealand Standard Time INFO     mail-api: [f47fdfc6] GET /owner/activity → 200 (0ms)
+16/06/2026 06:56:04 New Zealand Standard Time INFO     mail-api: [ef4b6c2a] GET /owner/client-enquiry → 200 (0ms)
+16/06/2026 06:56:21 New Zealand Standard Time INFO     mail-api: [59ef0c42] GET /owner/activity → 200 (1ms)
+16/06/2026 06:57:43 New Zealand Standard Time INFO     mail-api: [ce3133ef] GET /auth/verify → 200 (0ms)
+16/06/2026 06:57:43 New Zealand Standard Time INFO     mail-api: [c6a5dfeb] GET /owner/all-clients → 200 (1ms)
+16/06/2026 06:57:43 New Zealand Standard Time INFO     mail-api: [de7d24a0] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 06:57:43 New Zealand Standard Time INFO     mail-api: [bf7f5696] GET /owner/birthdays → 200 (0ms)
+16/06/2026 06:57:46 New Zealand Standard Time INFO     mail-api: [08a9d0a6] GET /owner/message-templates → 200 (1ms)
+16/06/2026 06:57:46 New Zealand Standard Time INFO     mail-api: [9388927c] POST /owner/render-message → 200 (1ms)
+16/06/2026 07:00:13 New Zealand Standard Time INFO     mail-api: [39b85a36] GET /owner/activity → 200 (0ms)
+16/06/2026 07:02:06 New Zealand Standard Time INFO     mail-api: [2fbeef76] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:06:11 New Zealand Standard Time INFO     mail-api: [1c8a494a] GET /owner/activity → 200 (1ms)
+16/06/2026 07:06:42 New Zealand Standard Time INFO     mail-api: [41ddcc81] GET /owner/activity → 200 (0ms)
+16/06/2026 07:13:10 New Zealand Standard Time INFO     mail-api: [93328ec4] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:14:02 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:02 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:02 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:14:02 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:14:02 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:14:02 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:14:08 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:08 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:08 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:14:08 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:14:08 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:14:08 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:14:25 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:25 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:31 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:31 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:31 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:14:31 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:14:31 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:14:31 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:14:46 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:46 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:46 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:14:46 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:14:46 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:14:46 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:14:59 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:14:59 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:14:59 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:14:59 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:14:59 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:14:59 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:15:06 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:15:06 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:15:06 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:15:06 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:15:06 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:15:06 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:15:24 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:15:24 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:15:24 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:15:24 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:15:24 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:15:24 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:15:50 New Zealand Standard Time INFO     mail-api: [825c3ae9] GET /auth/verify → 401 (2ms)
+16/06/2026 07:15:54 New Zealand Standard Time INFO     mail-api: [d2197895] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:15:54 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 269988
+16/06/2026 07:15:54 New Zealand Standard Time INFO     mail-api: [d2197895] POST /auth/request-code → 200 (2ms)
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [f3567591] auth: session created for email=info@goodwalk.co.nz
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [f3567591] POST /auth/verify-code → 200 (2ms)
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [f568d6aa] GET /auth/verify → 200 (0ms)
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [15422225] GET /owner/pending-onboarding → 200 (2ms)
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [560b7831] GET /owner/all-clients → 200 (5ms)
+16/06/2026 07:16:05 New Zealand Standard Time INFO     mail-api: [b7db7b94] GET /owner/birthdays → 200 (5ms)
+16/06/2026 07:16:20 New Zealand Standard Time INFO     mail-api: [b1f1abfd] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:16:46 New Zealand Standard Time INFO     mail-api: [c80114ed] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:16:57 New Zealand Standard Time INFO     mail-api: [f47002dd] GET /owner/message-templates → 200 (1ms)
+16/06/2026 07:16:57 New Zealand Standard Time INFO     mail-api: [949a4211] POST /owner/render-message → 200 (2ms)
+16/06/2026 07:17:07 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:17:07 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:17:07 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:17:07 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:17:07 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:17:07 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:17:13 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:17:13 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:17:13 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:17:13 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:17:13 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:17:13 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:17:20 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:17:20 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:17:20 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:17:20 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:17:20 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:17:20 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:17:27 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:17:27 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:17:27 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:17:27 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:17:27 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:17:27 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:18:01 New Zealand Standard Time INFO     mail-api: [8cdf225d] GET /auth/verify → 401 (2ms)
+16/06/2026 07:18:05 New Zealand Standard Time INFO     mail-api: [cbe1d0d9] auth: unknown email=info@goodwalk.co.z ip=127.0.0.1
+16/06/2026 07:18:05 New Zealand Standard Time WARNING  mail-api: [cbe1d0d9] auth: failure ip=127.0.0.1 reason='unknown_email' total_in_window=1
+16/06/2026 07:18:05 New Zealand Standard Time INFO     mail-api: [cbe1d0d9] POST /auth/request-code → 403 (2ms)
+16/06/2026 07:18:08 New Zealand Standard Time INFO     mail-api: [008f2e1a] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:18:08 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 952701
+16/06/2026 07:18:08 New Zealand Standard Time INFO     mail-api: [008f2e1a] POST /auth/request-code → 200 (1ms)
+16/06/2026 07:18:14 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:18:14 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:18:14 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:18:14 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:18:14 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:18:14 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:18:20 New Zealand Standard Time INFO     mail-api: [369f9969] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:18:20 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 943074
+16/06/2026 07:18:20 New Zealand Standard Time INFO     mail-api: [369f9969] POST /auth/request-code → 200 (3ms)
+16/06/2026 07:18:31 New Zealand Standard Time INFO     mail-api: [ceb1fc90] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:18:31 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 261983
+16/06/2026 07:18:31 New Zealand Standard Time INFO     mail-api: [ceb1fc90] POST /auth/request-code → 200 (1ms)
+16/06/2026 07:25:18 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:25:18 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:25:18 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:25:18 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:25:18 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:25:18 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:25:20 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:25:20 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:25:20 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:25:20 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:25:20 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:25:20 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:25:28 New Zealand Standard Time INFO     mail-api: [098d12dc] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:25:28 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 496267
+16/06/2026 07:25:28 New Zealand Standard Time INFO     mail-api: [098d12dc] POST /auth/request-code → 200 (4ms)
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [8eb8c518] auth: session created for email=info@goodwalk.co.nz
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [8eb8c518] POST /auth/verify-code → 200 (2ms)
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [b4bcbfbd] GET /auth/verify → 200 (1ms)
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [37f1c7a9] GET /owner/pending-onboarding → 200 (2ms)
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [0daa6a9c] GET /owner/all-clients → 200 (7ms)
+16/06/2026 07:25:35 New Zealand Standard Time INFO     mail-api: [40680736] GET /owner/birthdays → 200 (7ms)
+16/06/2026 07:25:37 New Zealand Standard Time INFO     mail-api: [e9db9842] POST /owner/render-welcome-pack → 200 (14ms)
+16/06/2026 07:25:44 New Zealand Standard Time INFO     mail-api: [13fbb03a] POST /owner/render-welcome-pack → 200 (1ms)
+16/06/2026 07:25:49 New Zealand Standard Time INFO     mail-api: [fb8e73e3] POST /owner/render-welcome-pack → 200 (1ms)
+16/06/2026 07:25:51 New Zealand Standard Time INFO     mail-api: [22db529c] POST /owner/render-welcome-pack → 200 (1ms)
+16/06/2026 07:26:13 New Zealand Standard Time INFO     mail-api: [806f9017] GET /owner/scheduled-emails → 200 (2ms)
+16/06/2026 07:26:15 New Zealand Standard Time INFO     mail-api: [2864b4ca] GET /owner/message-templates → 200 (1ms)
+16/06/2026 07:26:15 New Zealand Standard Time INFO     mail-api: [f133698c] POST /owner/render-message → 200 (3ms)
+16/06/2026 07:47:45 New Zealand Standard Time INFO     mail-api: [11b1a1dd] POST /owner/render-welcome-pack → 200 (1ms)
+16/06/2026 07:48:20 New Zealand Standard Time INFO     mail-api: [03817871] GET /auth/verify → 200 (0ms)
+16/06/2026 07:48:20 New Zealand Standard Time INFO     mail-api: [1b5b54f8] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 07:48:20 New Zealand Standard Time INFO     mail-api: [d0736f04] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:48:20 New Zealand Standard Time INFO     mail-api: [4919bec5] GET /owner/birthdays → 200 (1ms)
+16/06/2026 07:48:38 New Zealand Standard Time INFO     mail-api: [3c6b1f63] GET /auth/verify → 200 (0ms)
+16/06/2026 07:48:38 New Zealand Standard Time INFO     mail-api: [c1ea7cf1] GET /owner/pending-onboarding → 200 (1ms)
+16/06/2026 07:48:38 New Zealand Standard Time INFO     mail-api: [a3a06d7a] GET /owner/all-clients → 200 (1ms)
+16/06/2026 07:48:38 New Zealand Standard Time INFO     mail-api: [c9a5683b] GET /owner/birthdays → 200 (2ms)
+16/06/2026 07:51:48 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:51:48 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:51:48 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:51:48 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:51:48 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:51:48 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:51:52 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:51:52 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:51:53 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:51:53 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:51:53 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:51:53 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:51:56 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:51:56 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:51:56 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:51:56 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:51:56 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:51:56 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:52:00 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+16/06/2026 07:52:00 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='info@goodwalk.co.nz' cp_admins=['info@goodwalk.co.nz'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+16/06/2026 07:52:00 New Zealand Standard Time INFO     mail-api: Auth: loaded 3 allowed email(s)
+16/06/2026 07:52:00 New Zealand Standard Time ERROR    mail-api: Startup smoke: WeasyPrint UNAVAILABLE — PDF attachments will be skipped (No module named 'weasyprint')
+16/06/2026 07:52:00 New Zealand Standard Time WARNING  mail-api: Startup smoke: postgres disabled — activity/submissions will NOT be recorded
+16/06/2026 07:52:00 New Zealand Standard Time INFO     mail-api: Startup test email skipped: OWNER_BCC is not set to a real address
+16/06/2026 07:52:54 New Zealand Standard Time INFO     mail-api: [01084365] GET /owner/client-onboarding-view → 401 (3ms)
+16/06/2026 07:52:55 New Zealand Standard Time INFO     mail-api: [117b9eb3] GET /auth/verify → 401 (1ms)
+16/06/2026 07:52:59 New Zealand Standard Time INFO     mail-api: [bee5ac03] auth: code issued for email=info@goodwalk.co.nz
+16/06/2026 07:52:59 New Zealand Standard Time WARNING  mail-api: [DEV] auth code for info@goodwalk.co.nz: 948798
+16/06/2026 07:52:59 New Zealand Standard Time INFO     mail-api: [bee5ac03] POST /auth/request-code → 200 (2ms)
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [d782d75d] auth: session created for email=info@goodwalk.co.nz
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [d782d75d] POST /auth/verify-code → 200 (3ms)
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [a8c2db4a] GET /auth/verify → 200 (0ms)
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [a2bc9b29] GET /owner/pending-onboarding → 200 (9ms)
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [110111bd] GET /owner/birthdays → 200 (9ms)
+16/06/2026 07:53:09 New Zealand Standard Time INFO     mail-api: [2fe1e0d1] GET /owner/all-clients → 200 (10ms)
+16/06/2026 07:53:12 New Zealand Standard Time INFO     mail-api: [3f755a79] GET /owner/client-onboarding-view → 200 (0ms)
+17/06/2026 07:22:07 New Zealand Standard Time INFO     mail-api: Logging initialised -> console=INFO, file=logs\mail-api.log (DEBUG, rotating)
+17/06/2026 07:22:07 New Zealand Standard Time INFO     mail-api: Mail API config: version='unknown' timezone='system-default' from='GoodWalk <info@goodwalk.co.nz>' reply_to='info@goodwalk.co.nz' owner='dev@localhost' cp_admins=['dev@localhost'] owner_bcc='' client_bcc='' general_enquiries=False max_attempts=3 form_min=1s form_max=7200s rate_window=900s per_ip=50 per_email=50 min_interval=1s send_timeout=20s
+17/06/2026 07:22:07 New Zealand Standard Time INFO     mail-api: MYOB integration: disabled (set MYOB_* env vars to enable)
diff --git a/mail-api/mail_api/__pycache__/config.cpython-314.pyc b/mail-api/mail_api/__pycache__/config.cpython-314.pyc
index 817fde9..62aa106 100644
Binary files a/mail-api/mail_api/__pycache__/config.cpython-314.pyc and b/mail-api/mail_api/__pycache__/config.cpython-314.pyc differ
diff --git a/mail-api/mail_api/__pycache__/models.cpython-314.pyc b/mail-api/mail_api/__pycache__/models.cpython-314.pyc
index 080be52..ece8aaf 100644
Binary files a/mail-api/mail_api/__pycache__/models.cpython-314.pyc and b/mail-api/mail_api/__pycache__/models.cpython-314.pyc differ
diff --git a/mail-api/mail_api/__pycache__/myob.cpython-314.pyc b/mail-api/mail_api/__pycache__/myob.cpython-314.pyc
new file mode 100644
index 0000000..5adc126
Binary files /dev/null and b/mail-api/mail_api/__pycache__/myob.cpython-314.pyc differ
diff --git a/mail-api/mail_api/config.py b/mail-api/mail_api/config.py
index b852bad..e9a4d0e 100644
--- a/mail-api/mail_api/config.py
+++ b/mail-api/mail_api/config.py
@@ -48,7 +48,7 @@ def setup_logging() -> logging.Logger:
     root.addHandler(rotating)
 
     log = logging.getLogger("mail-api")
-    log.info("Logging initialised → console=INFO, file=%s (DEBUG, rotating)", log_file)
+    log.info("Logging initialised -> console=INFO, file=%s (DEBUG, rotating)", log_file)
     return log
 
 
@@ -185,6 +185,10 @@ AUTH_IP_MAX_FAILURES = max(3, int(os.environ.get("AUTH_IP_MAX_FAILURES", "10")))
 AUTH_IP_FAILURE_WINDOW = max(60, int(os.environ.get("AUTH_IP_FAILURE_WINDOW", "600")))
 AUTH_IP_BLOCK_DURATION = max(60, int(os.environ.get("AUTH_IP_BLOCK_DURATION", "3600")))
 BIRTHDAY_CHECK_INTERVAL_SECONDS = max(3600, int(os.environ.get("BIRTHDAY_CHECK_INTERVAL_SECONDS", str(12 * 3600))))
+# How often the scheduled-email worker wakes to dispatch any sends that have
+# come due. Scheduled welcome emails need finer granularity than the birthday
+# sweep, so this defaults to one minute (floored at 15s).
+SCHEDULED_CHECK_INTERVAL_SECONDS = max(15, int(os.environ.get("SCHEDULED_CHECK_INTERVAL_SECONDS", "60")))
 
 
 def _split_csv_env(name: str, default: str) -> tuple[str, ...]:
@@ -211,6 +215,10 @@ _DATA_DIR = Path(os.environ.get("DATA_DIR", "data"))
 ALLOWED_EMAILS_FILE = _DATA_DIR / "allowed_emails.json"
 CLIENT_PROFILES_FILE = _DATA_DIR / "client_profiles.json"
 DRAFTS_FILE = _DATA_DIR / "drafts.json"
+# Durable queue of owner-scheduled emails (welcome packs queued for later send).
+# Mirrors the client_profiles persistence model: postgres admin_kv is canonical
+# in production, with this JSON file as the dev/local fallback and seed source.
+SCHEDULED_EMAILS_FILE = _DATA_DIR / "scheduled_emails.json"
 # Legacy seed lives OUTSIDE the data volume — it's shipped in the image so a
 # fresh deploy always carries the same baked-in copy. On boot the mail-api
 # merges this dict into _client_profiles, adding any emails that aren't
@@ -221,6 +229,27 @@ LEGACY_SEED_FILE = Path(
 
 LOGO_URL = "https://www.goodwalk.co.nz/images/goodwalk-auckland-dog-walking-logo.png"
 
+# ── MYOB integration ───────────────────────────────────────────────────────────
+# Optional: create new clients as customer contacts in MYOB AccountRight Live.
+# The integration stays disabled until every required value is present, so an
+# unconfigured environment behaves exactly as before.
+#
+#   MYOB_API_KEY / MYOB_API_SECRET   the developer app's OAuth client id/secret
+#   MYOB_REFRESH_TOKEN               long-lived token used to mint access tokens
+#   MYOB_COMPANY_FILE_URI            base API URI of the target company file,
+#                                    e.g. https://api.myob.com/accountright/<guid>
+#   MYOB_CF_USERNAME / MYOB_CF_PASSWORD  company-file login (password may be blank)
+#   MYOB_TOKEN_URL                   OAuth token endpoint (override only for tests)
+MYOB_API_KEY = (os.environ.get("MYOB_API_KEY") or "").strip()
+MYOB_API_SECRET = (os.environ.get("MYOB_API_SECRET") or "").strip()
+MYOB_REFRESH_TOKEN = (os.environ.get("MYOB_REFRESH_TOKEN") or "").strip()
+MYOB_COMPANY_FILE_URI = (os.environ.get("MYOB_COMPANY_FILE_URI") or "").strip().rstrip("/")
+MYOB_CF_USERNAME = (os.environ.get("MYOB_CF_USERNAME") or "Administrator").strip()
+MYOB_CF_PASSWORD = os.environ.get("MYOB_CF_PASSWORD", "")
+MYOB_TOKEN_URL = (os.environ.get("MYOB_TOKEN_URL") or "https://secure.myob.com/oauth2/v1/authorize").strip()
+MYOB_HTTP_TIMEOUT_SECONDS = max(5, int(os.environ.get("MYOB_HTTP_TIMEOUT_SECONDS", "20")))
+MYOB_ENABLED = bool(MYOB_API_KEY and MYOB_API_SECRET and MYOB_REFRESH_TOKEN and MYOB_COMPANY_FILE_URI)
+
 # ── Legacy module constants (kept for compatibility with the existing main.py) ──
 
 OWNER_EMAIL = settings.owner_email
@@ -268,3 +297,4 @@ logger.info(
     RATE_LIMIT_MIN_INTERVAL_SECONDS,
     EMAIL_SEND_TIMEOUT_SECONDS,
 )
+logger.info("MYOB integration: %s", "enabled" if MYOB_ENABLED else "disabled (set MYOB_* env vars to enable)")
diff --git a/mail-api/mail_api/models.py b/mail-api/mail_api/models.py
index 447e9be..0feecbe 100644
--- a/mail-api/mail_api/models.py
+++ b/mail-api/mail_api/models.py
@@ -41,9 +41,13 @@ class OnboardingSubmission(BaseSubmission):
     medicalNotes: str = ""
     accessInstructions: str = ""
     vetName: str
+    vetAddress: str
     vetPhone: str
     emergencyContactName: str
     emergencyContactPhone: str
+    regularFleaTickTreatment: str = ""
+    petInsurance: str = ""
+    petInsuranceOwnerExpenseAccepted: bool = False
     councilRegistrationConfirmed: bool = False
     vaccinationsConfirmed: bool = False
     emergencyVetConsent: bool = False
@@ -54,15 +58,33 @@ class OnboardingSubmission(BaseSubmission):
 
 class WelcomePackEmailRequest(BaseModel):
     email: EmailStr
+    # Owner-set subject line. Defaults to "Goodwalk Onboarding - <Dog Name>" when
+    # blank (resolved server-side so scheduled sends keep a sensible subject too).
+    subject: str = ""
     serviceType: str
     priceDetails: str
     startDate: str
     preview: bool = False
+    previewRecipients: list[EmailStr] = []
+    # ISO 8601 local datetime (e.g. "2026-06-20T14:30"). When set on a non-preview
+    # request, the welcome email is queued for reliable delivery at that time
+    # instead of being sent immediately.
+    scheduledFor: str | None = None
+
+
+class ScheduledEmailCancelRequest(BaseModel):
+    id: str
+
+
+class ScheduledEmailRescheduleRequest(BaseModel):
+    id: str
+    scheduledFor: str
 
 
 class BirthdayEmailRequest(BaseModel):
     email: EmailStr
     preview: bool = False
+    previewRecipients: list[EmailStr] = []
 
 
 class BirthdayAutoSendRequest(BaseModel):
@@ -81,6 +103,42 @@ class ClientStatusUpdate(BaseModel):
     reason: str = ""
 
 
+class ClientProfileUpdate(BaseModel):
+    email: EmailStr
+    nextEmail: EmailStr
+    fullName: str
+    phone: str = ""
+    address: str = ""
+    dogName: str
+
+
+class ResetOnboardingRequest(BaseModel):
+    """Owner-initiated reset: keep the client's saved details but mark their
+    onboarding incomplete so they can sign in and complete the new form
+    (used for clients imported from the legacy Gravity Forms data)."""
+
+    email: EmailStr
+
+
+class NewClientRequest(BaseModel):
+    """Owner-initiated client creation (e.g. leads from Instagram / Facebook
+    that never came through the public enquiry form). Registers the email so
+    the client can access the onboarding form, and seeds a profile."""
+
+    email: EmailStr
+    fullName: str
+    phone: str = ""
+    address: str = ""
+    dogName: str = ""
+    dogBreed: str = ""
+    # Where the client came from, e.g. "Instagram", "Facebook", "Referral".
+    source: str = ""
+    # When true (and the MYOB integration is configured), also create the client
+    # as a customer contact in MYOB. Non-fatal: a MYOB failure never blocks the
+    # local client from being created.
+    createInMyob: bool = False
+
+
 class ContractSubmission(BaseSubmission):
     address: str
     dogName: str
@@ -126,3 +184,4 @@ class SendMessageRequest(BaseModel):
     fontId: str = "system"
     recipients: list[EmailStr] = []
     preview: bool = False
+    previewRecipients: list[EmailStr] = []
diff --git a/mail-api/mail_api/myob.py b/mail-api/mail_api/myob.py
new file mode 100644
index 0000000..f77a37b
--- /dev/null
+++ b/mail-api/mail_api/myob.py
@@ -0,0 +1,212 @@
+"""MYOB AccountRight Live integration — create customer contacts.
+
+Used when the owner ticks "Also create in MYOB" while adding a new client in the
+control panel. The integration is optional: when the required environment
+variables are not set, :func:`is_configured` returns ``False`` and the caller
+skips MYOB entirely (the local client is still created).
+
+Auth model (MYOB OAuth 2.0):
+  * A developer key/secret (``client_id`` / ``client_secret``) identifies this
+    app to MYOB.
+  * A long-lived refresh token mints short-lived bearer access tokens. We cache
+    the access token in memory and refresh it shortly before it expires.
+  * Each AccountRight company file lives at its own base URI and is gated by a
+    company-file token: ``base64("username:password")`` sent as the
+    ``x-myobapi-cftoken`` header (password may be blank).
+
+All HTTP calls are synchronous (``requests``); the async app invokes the public
+helpers via ``asyncio.to_thread`` so the event loop is never blocked.
+"""
+
+from __future__ import annotations
+
+import base64
+import threading
+import time
+
+import requests
+
+from mail_api.config import (
+    MYOB_API_KEY,
+    MYOB_API_SECRET,
+    MYOB_CF_PASSWORD,
+    MYOB_CF_USERNAME,
+    MYOB_COMPANY_FILE_URI,
+    MYOB_ENABLED,
+    MYOB_HTTP_TIMEOUT_SECONDS,
+    MYOB_REFRESH_TOKEN,
+    MYOB_TOKEN_URL,
+    logger,
+)
+
+
+class MyobError(Exception):
+    """Raised when a MYOB API call cannot be completed."""
+
+
+# Access tokens are short-lived (MYOB returns ~20 min). Cache the current token
+# and its expiry so back-to-back client creations reuse a single refresh.
+_token_lock = threading.Lock()
+_cached_token: str = ""
+_cached_token_expires_at: float = 0.0
+# Refresh a little early so a token never expires mid-request.
+_TOKEN_EXPIRY_SKEW_SECONDS = 60
+
+
+def is_configured() -> bool:
+    """True when every credential needed to talk to MYOB is present."""
+    return MYOB_ENABLED
+
+
+def _cf_token() -> str:
+    raw = f"{MYOB_CF_USERNAME}:{MYOB_CF_PASSWORD}".encode("utf-8")
+    return base64.b64encode(raw).decode("ascii")
+
+
+def _refresh_access_token() -> str:
+    """Exchange the stored refresh token for a fresh access token.
+
+    Caches the result in module state. Raises :class:`MyobError` on failure.
+    """
+    global _cached_token, _cached_token_expires_at
+
+    try:
+        resp = requests.post(
+            MYOB_TOKEN_URL,
+            data={
+                "client_id": MYOB_API_KEY,
+                "client_secret": MYOB_API_SECRET,
+                "grant_type": "refresh_token",
+                "refresh_token": MYOB_REFRESH_TOKEN,
+            },
+            headers={"Content-Type": "application/x-www-form-urlencoded"},
+            timeout=MYOB_HTTP_TIMEOUT_SECONDS,
+        )
+    except requests.RequestException as exc:
+        raise MyobError(f"Could not reach the MYOB token service: {exc}") from exc
+
+    if resp.status_code != 200:
+        raise MyobError(
+            f"MYOB token refresh failed (HTTP {resp.status_code}). "
+            "Check MYOB_API_KEY / MYOB_API_SECRET / MYOB_REFRESH_TOKEN."
+        )
+
+    try:
+        payload = resp.json()
+    except ValueError as exc:
+        raise MyobError("MYOB token service returned an unreadable response.") from exc
+
+    token = str(payload.get("access_token") or "").strip()
+    if not token:
+        raise MyobError("MYOB token service did not return an access token.")
+
+    try:
+        expires_in = int(payload.get("expires_in", 1200))
+    except (TypeError, ValueError):
+        expires_in = 1200
+
+    _cached_token = token
+    _cached_token_expires_at = time.monotonic() + max(0, expires_in - _TOKEN_EXPIRY_SKEW_SECONDS)
+    logger.info("MYOB: access token refreshed (valid ~%ds)", expires_in)
+    return token
+
+
+def _access_token() -> str:
+    with _token_lock:
+        if _cached_token and time.monotonic() < _cached_token_expires_at:
+            return _cached_token
+        return _refresh_access_token()
+
+
+def _api_headers() -> dict[str, str]:
+    return {
+        "Authorization": f"Bearer {_access_token()}",
+        "x-myobapi-key": MYOB_API_KEY,
+        "x-myobapi-version": "v2",
+        "x-myobapi-cftoken": _cf_token(),
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+    }
+
+
+def _split_name(full_name: str) -> tuple[str, str]:
+    """Best-effort split of a single owner name into first/last for MYOB."""
+    parts = full_name.split()
+    if not parts:
+        return ("", "")
+    if len(parts) == 1:
+        return (parts[0], "")
+    return (parts[0], " ".join(parts[1:]))
+
+
+def create_customer(
+    *,
+    email: str,
+    full_name: str,
+    phone: str = "",
+    street: str = "",
+    source: str = "",
+) -> dict[str, str]:
+    """Create an individual customer contact in MYOB.
+
+    Returns ``{"uid": ..., "uri": ...}`` parsed from the ``Location`` header MYOB
+    returns on a successful create. Raises :class:`MyobError` on any failure so
+    the caller can record it without aborting the local client creation.
+    """
+    if not is_configured():
+        raise MyobError("MYOB integration is not configured.")
+
+    first_name, last_name = _split_name(full_name)
+    body = {
+        "IsIndividual": True,
+        "FirstName": first_name,
+        "LastName": last_name,
+        "IsActive": True,
+        "Addresses": [
+            {
+                "Location": 1,
+                "Email": email,
+                "Phone1": phone,
+                "Street": street,
+            }
+        ],
+    }
+    if source:
+        body["Notes"] = f"Added via Goodwalk control panel — source: {source}"
+
+    url = f"{MYOB_COMPANY_FILE_URI}/Contact/Customer"
+    try:
+        resp = requests.post(
+            url,
+            json=body,
+            headers=_api_headers(),
+            timeout=MYOB_HTTP_TIMEOUT_SECONDS,
+        )
+    except requests.RequestException as exc:
+        raise MyobError(f"Could not reach MYOB: {exc}") from exc
+
+    # 200/201 both indicate success depending on API version; MYOB returns the
+    # new record's URI in the Location header.
+    if resp.status_code not in (200, 201):
+        detail = _error_detail(resp)
+        raise MyobError(f"MYOB rejected the customer (HTTP {resp.status_code}): {detail}")
+
+    location = resp.headers.get("Location", "")
+    uid = location.rstrip("/").rsplit("/", 1)[-1] if location else ""
+    logger.info("MYOB: created customer uid=%s for %s", uid or "?", email)
+    return {"uid": uid, "uri": location}
+
+
+def _error_detail(resp: requests.Response) -> str:
+    """Extract a human-readable error message from a MYOB error response."""
+    try:
+        data = resp.json()
+    except ValueError:
+        return (resp.text or "").strip()[:300] or "no detail provided"
+    errors = data.get("Errors") if isinstance(data, dict) else None
+    if isinstance(errors, list) and errors:
+        messages = [str(e.get("Message", "")).strip() for e in errors if isinstance(e, dict)]
+        joined = "; ".join(m for m in messages if m)
+        if joined:
+            return joined
+    return str(data)[:300]
diff --git a/mail-api/main.py b/mail-api/main.py
index e465b1f..3e680fa 100644
--- a/mail-api/main.py
+++ b/mail-api/main.py
@@ -21,6 +21,7 @@ from fastapi.responses import JSONResponse, Response
 from starlette.types import ASGIApp, Receive, Scope, Send
 
 import db as admin_db
+from mail_api import myob
 from mail_api.config import (
     ALLOWED_EMAILS_FILE as _ALLOWED_EMAILS_FILE,
     APP_VERSION,
@@ -55,6 +56,8 @@ from mail_api.config import (
     RATE_LIMIT_MIN_INTERVAL_SECONDS,
     RATE_LIMIT_WINDOW_SECONDS,
     REPLY_TO,
+    SCHEDULED_CHECK_INTERVAL_SECONDS,
+    SCHEDULED_EMAILS_FILE as _SCHEDULED_EMAILS_FILE,
     STARTUP_TEST_RECIPIENT,
     TRUSTED_HOSTS,
     logger,
@@ -63,11 +66,16 @@ from mail_api.models import (
     BaseSubmission,
     BirthdayAutoSendRequest,
     BirthdayEmailRequest,
+    ClientProfileUpdate,
     BookingSubmission,
     ClientStatusUpdate,
     ContractSubmission,
+    NewClientRequest,
     OnboardingSubmission,
     RenderMessageRequest,
+    ResetOnboardingRequest,
+    ScheduledEmailCancelRequest,
+    ScheduledEmailRescheduleRequest,
     SendMessageRequest,
     WelcomePackEmailRequest,
 )
@@ -152,6 +160,24 @@ def _save_drafts_file(drafts: dict) -> None:
         logger.warning("Could not save drafts file: %s", exc)
 
 
+def _load_scheduled_emails_from_file() -> dict[str, dict]:
+    try:
+        if _SCHEDULED_EMAILS_FILE.exists():
+            data = json.loads(_SCHEDULED_EMAILS_FILE.read_text(encoding="utf-8"))
+            if isinstance(data, dict):
+                return data
+    except Exception as exc:
+        logger.warning("Could not load scheduled_emails file: %s", exc)
+    return {}
+
+
+def _save_scheduled_emails_file(scheduled: dict) -> None:
+    try:
+        _write_pii_json(_SCHEDULED_EMAILS_FILE, scheduled)
+    except Exception as exc:
+        logger.warning("Could not save scheduled_emails file: %s", exc)
+
+
 async def _save_active_sessions_async() -> None:
     """Persist live sessions to admin_kv so they survive container restarts.
 
@@ -322,6 +348,14 @@ async def _load_drafts_async() -> dict:
     return _load_drafts_from_file()
 
 
+async def _load_scheduled_emails_async() -> dict[str, dict]:
+    if admin_db.is_enabled():
+        data = await admin_db.get_kv("scheduled_emails")
+        if isinstance(data, dict):
+            return data
+    return _load_scheduled_emails_from_file()
+
+
 _allowed_emails: set[str] = _load_allowed_emails_from_file()
 if OWNER_EMAIL:
     _allowed_emails.add(OWNER_EMAIL.strip().lower())
@@ -334,6 +368,12 @@ _auth_failures_by_ip: dict[str, deque] = {}  # ip -> deque of failure timestamps
 _blocked_ips: dict[str, float] = {}           # ip -> unblock_at (monotonic)
 _auth_lock = asyncio.Lock()
 _birthday_auto_task: asyncio.Task | None = None
+# Durable queue of owner-scheduled emails, keyed by id. Each entry is a dict
+# (see _enqueue_scheduled_welcome). Persisted to admin_kv / JSON via
+# _persist_scheduled_emails so queued sends survive a container restart.
+_scheduled_emails: dict[str, dict] = _load_scheduled_emails_from_file()
+_scheduled_task: asyncio.Task | None = None
+_scheduled_lock = asyncio.Lock()
 
 logger.info("Auth: loaded %d allowed email(s)", len(_allowed_emails))
 
@@ -402,6 +442,136 @@ async def _store_client_profile(email: str, profile: dict) -> None:
             await asyncio.to_thread(_save_client_profiles_file, snapshot)
             await _persist_admin_state("client_profiles", snapshot)
 
+
+async def _persist_scheduled_emails() -> None:
+    """Write the scheduled-email queue to the JSON file + postgres. Callers
+    must hold _scheduled_lock so the snapshot is internally consistent."""
+    snapshot = dict(_scheduled_emails)
+    await asyncio.to_thread(_save_scheduled_emails_file, snapshot)
+    await _persist_admin_state("scheduled_emails", snapshot)
+
+
+def _parse_schedule_datetime(value: str) -> datetime:
+    """Parse an ISO 8601 datetime from the owner UI (datetime-local sends
+    'YYYY-MM-DDTHH:MM'). Returns a naive local datetime to match the rest of
+    the app, which compares against datetime.now(). Raises HTTPException(400)
+    on anything unparseable."""
+    raw = (value or "").strip()
+    if not raw:
+        raise HTTPException(status_code=400, detail="Please choose a date and time to schedule the email.")
+    try:
+        parsed = datetime.fromisoformat(raw)
+    except ValueError:
+        raise HTTPException(status_code=400, detail="That schedule time could not be understood.")
+    # Drop any timezone so comparisons against datetime.now() (naive) are valid.
+    if parsed.tzinfo is not None:
+        parsed = parsed.astimezone().replace(tzinfo=None)
+    return parsed
+
+
+async def _update_client_profile(
+    email: str,
+    next_email: str,
+    profile_updates: dict[str, Any],
+) -> dict[str, Any]:
+    normalized = email.strip().lower()
+    next_normalized = next_email.strip().lower()
+    if not normalized or not next_normalized:
+        raise HTTPException(status_code=400, detail="A valid email is required.")
+
+    async with _auth_lock:
+        existing = _client_profiles.get(normalized)
+        if not isinstance(existing, dict):
+            raise HTTPException(status_code=404, detail="Client not found.")
+
+        target_existing = _client_profiles.get(next_normalized)
+        if next_normalized != normalized and isinstance(target_existing, dict):
+            raise HTTPException(status_code=409, detail="Another client already uses that email address.")
+
+        merged = {
+            k: v
+            for k, v in {**existing, **profile_updates}.items()
+            if v is not None and not (isinstance(v, str) and v == "")
+        }
+
+        if next_normalized != normalized:
+            _client_profiles.pop(normalized, None)
+            _client_profiles[next_normalized] = merged
+
+            draft = _drafts.pop(normalized, None)
+            if draft is not None:
+                _drafts[next_normalized] = draft
+
+            pending = _pending_codes.pop(normalized, None)
+            if pending is not None:
+                _pending_codes[next_normalized] = pending
+
+            code_requests = _code_requests.pop(normalized, None)
+            if code_requests is not None:
+                _code_requests[next_normalized] = code_requests
+
+            for session in _active_sessions.values():
+                if isinstance(session, dict) and session.get("email") == normalized:
+                    session["email"] = next_normalized
+
+            if normalized != OWNER_EMAIL.strip().lower():
+                _allowed_emails.discard(normalized)
+            _allowed_emails.add(next_normalized)
+        else:
+            _client_profiles[normalized] = merged
+
+        profiles_snapshot = dict(_client_profiles)
+        drafts_snapshot = dict(_drafts)
+        allowed_emails_snapshot = sorted(_allowed_emails)
+
+    await asyncio.to_thread(_save_client_profiles_file, profiles_snapshot)
+    await asyncio.to_thread(_save_drafts_file, drafts_snapshot)
+    await asyncio.to_thread(_save_allowed_emails_file, set(allowed_emails_snapshot))
+    await _persist_admin_state("client_profiles", profiles_snapshot)
+    await _persist_admin_state("drafts", drafts_snapshot)
+    await _persist_admin_state("allowed_emails", {"emails": allowed_emails_snapshot})
+    await _save_active_sessions_async()
+
+    return merged
+
+
+async def _reset_client_onboarding(email: str) -> dict[str, Any]:
+    """Mark a client's onboarding as incomplete while keeping every saved detail.
+
+    Used for clients imported from the legacy Gravity Forms data: they keep their
+    contact/dog details (and their previous submission is archived for reference),
+    but they drop back into the pending list so they can sign in with their email
+    and complete the new onboarding form.
+    """
+    normalized = email.strip().lower()
+    if not normalized:
+        raise HTTPException(status_code=400, detail="A valid email is required.")
+
+    async with _auth_lock:
+        existing = _client_profiles.get(normalized)
+        if not isinstance(existing, dict):
+            raise HTTPException(status_code=404, detail="Client not found.")
+
+        updated = dict(existing)
+        updated["onboardingCompleted"] = False
+        # Archive the prior completion so nothing is lost, then clear the live
+        # markers that keep them out of the pending / onboarding views.
+        previous_submitted = updated.pop("onboardingSubmittedAt", "")
+        previous_submission = updated.pop("onboardingSubmission", None)
+        if previous_submitted:
+            updated["previousOnboardingSubmittedAt"] = previous_submitted
+        if previous_submission is not None:
+            updated["previousOnboardingSubmission"] = previous_submission
+        updated["onboardingResetAt"] = datetime.now().isoformat(timespec="seconds")
+
+        _client_profiles[normalized] = updated
+        snapshot = dict(_client_profiles)
+
+    await asyncio.to_thread(_save_client_profiles_file, snapshot)
+    await _persist_admin_state("client_profiles", snapshot)
+    return updated
+
+
 def _check_ip_blocked(ip: str, request_id: str) -> None:
     now = time.monotonic()
     unblock_at = _blocked_ips.get(ip)
@@ -762,7 +932,9 @@ def _validate_onboarding_submission(request_id: str, data: OnboardingSubmission)
         "address": "Please enter your address.",
         "dogName": "Please enter your dog's name.",
         "dogBreed": "Please enter your dog's breed.",
+        "dogAge": "Please enter your dog's date of birth.",
         "vetName": "Please enter your vet clinic name.",
+        "vetAddress": "Please enter your vet address.",
         "vetPhone": "Please enter your vet phone number.",
         "emergencyContactName": "Please enter an emergency contact name.",
         "emergencyContactPhone": "Please enter an emergency contact phone number.",
@@ -777,11 +949,18 @@ def _validate_onboarding_submission(request_id: str, data: OnboardingSubmission)
         logger.warning("[%s] onboarding rejected: missing services", request_id)
         raise HTTPException(status_code=400, detail="Please choose at least one service.")
 
-    if not data.councilRegistrationConfirmed:
-        raise HTTPException(status_code=400, detail="Please confirm council registration.")
+    if data.regularFleaTickTreatment not in {"yes", "no"}:
+        raise HTTPException(status_code=400, detail="Please confirm whether your dog gets regular flea and tick treatment.")
 
-    if not data.vaccinationsConfirmed:
-        raise HTTPException(status_code=400, detail="Please confirm vaccinations are current.")
+    if data.petInsurance not in {"yes", "no"}:
+        raise HTTPException(status_code=400, detail="Please confirm whether your dog has pet insurance.")
+
+    if data.petInsurance == "no" and not data.petInsuranceOwnerExpenseAccepted:
+        raise HTTPException(status_code=400, detail="Please confirm the owner-expense acknowledgement for dogs without pet insurance.")
+
+    # Council registration and vaccination are no longer hard blockers: the owner
+    # reviews these on the submission and follows up with the client separately.
+    # The actual yes/no answers are preserved on the snapshot and surfaced below.
 
     if not data.emergencyVetConsent:
         raise HTTPException(status_code=400, detail="Please confirm emergency veterinary consent.")
@@ -806,9 +985,12 @@ def _normalize_onboarding_submission(data: OnboardingSubmission) -> None:
     data.medicalNotes = _trimmed(data.medicalNotes)
     data.accessInstructions = _trimmed(data.accessInstructions)
     data.vetName = _trimmed(data.vetName)
+    data.vetAddress = _trimmed(data.vetAddress)
     data.vetPhone = _trimmed(data.vetPhone)
     data.emergencyContactName = _trimmed(data.emergencyContactName)
     data.emergencyContactPhone = _trimmed(data.emergencyContactPhone)
+    data.regularFleaTickTreatment = _trimmed(data.regularFleaTickTreatment).lower()
+    data.petInsurance = _trimmed(data.petInsurance).lower()
     data.referrer = _trimmed(data.referrer)
     data.page = _trimmed(data.page)
     data.servicesNeeded = [_trimmed(service) for service in data.servicesNeeded if _trimmed(service)][:8]
@@ -1465,6 +1647,7 @@ def owner_onboarding_email(data: OnboardingSubmission, ip: str, browser: str) ->
                   {_detail_row("Email", str(data.email))}
                   {_detail_row("Phone", data.phone)}
                   {_detail_row("Address", data.address)}
+                  {access_block}
                 </table>
               </td></tr>
             </table>
@@ -1475,11 +1658,10 @@ def owner_onboarding_email(data: OnboardingSubmission, ip: str, browser: str) ->
                 <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
                   {_detail_row("Dog", data.dogName)}
                   {_detail_row("Breed", data.dogBreed)}
-                  {_detail_row("Age", data.dogAge or "—")}
+                  {_detail_row("Date of birth", data.dogAge or "—")}
                   {_detail_row("Service", services_text)}
                   {dog_notes_block}
                   {medical_block}
-                  {access_block}
                 </table>
               </td></tr>
             </table>
@@ -1490,10 +1672,14 @@ def owner_onboarding_email(data: OnboardingSubmission, ip: str, browser: str) ->
                 <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
                   {_detail_row("Vet clinic", data.vetName)}
                   {_detail_row("Vet phone", data.vetPhone)}
+                  {_detail_row("Vet address", data.vetAddress)}
                   {_detail_row("Emergency contact", data.emergencyContactName)}
                   {_detail_row("Emergency phone", data.emergencyContactPhone)}
-                  {_detail_row("Council registration", "Confirmed")}
-                  {_detail_row("Vaccinations", "Confirmed")}
+                  {_detail_row("Regular flea and tick treatment", "Yes" if data.regularFleaTickTreatment == "yes" else "No")}
+                  {_detail_row("Pet insurance", "Yes" if data.petInsurance == "yes" else "No")}
+                  {_detail_row("Owner covers all vet costs", "Confirmed") if data.petInsurance == "no" and data.petInsuranceOwnerExpenseAccepted else ""}
+                  {_detail_row("Council registration", "Confirmed" if data.councilRegistrationConfirmed else "Not confirmed — follow up")}
+                  {_detail_row("Vaccinations", "Confirmed" if data.vaccinationsConfirmed else "Not confirmed — follow up")}
                   {_detail_row("Emergency consent", "Confirmed")}
                   {_detail_row("Declaration", "Signed")}
                 </table>
@@ -1631,6 +1817,7 @@ def owner_onboarding_pdf_html(data: OnboardingSubmission) -> str:
             + row("Email", str(data.email))
             + row("Phone", data.phone)
             + row("Address", data.address)
+            + row("Home access", data.accessInstructions)
         )
         dog_rows = (
             row("Dog", data.dogName)
@@ -1639,13 +1826,16 @@ def owner_onboarding_pdf_html(data: OnboardingSubmission) -> str:
             + row("Services", data.servicesNeeded)
             + row("Temperament / routine", data.temperament)
             + row("Medical notes", data.medicalNotes)
-            + row("Home access", data.accessInstructions)
         )
         safety_rows = (
             row("Vet clinic", data.vetName)
             + row("Vet phone", data.vetPhone)
+            + row("Vet address", data.vetAddress)
             + row("Emergency contact", data.emergencyContactName)
             + row("Emergency phone", data.emergencyContactPhone)
+            + row("Regular flea and tick treatment", "Yes" if data.regularFleaTickTreatment == "yes" else "No")
+            + row("Pet insurance", "Yes" if data.petInsurance == "yes" else "No")
+            + row("Owner covers all vet costs", "Confirmed" if data.petInsurance == "no" and data.petInsuranceOwnerExpenseAccepted else "")
             + row("Council registration", "Confirmed" if data.councilRegistrationConfirmed else "Not confirmed")
             + row("Vaccinations", "Confirmed" if data.vaccinationsConfirmed else "Not confirmed")
             + row("Emergency vet consent", "Confirmed" if data.emergencyVetConsent else "Not confirmed")
@@ -1804,6 +1994,22 @@ async def _signed_form_pdf_attachment(html: str, full_name: str, kind: str, requ
 
 # ── Sending with retries ─────────────────────────────────────────────────────
 
+def _client_bcc_list() -> list[str]:
+    """BCC recipients for any real email sent home to a client (welcome pack,
+    birthday, enquiry reply, onboarding confirmation, ...). The business owner is
+    always copied so they can see exactly what each client received; CLIENT_BCC
+    adds an optional extra inbox when configured. The OWNER_BCC placeholder is
+    treated as unset."""
+    out: list[str] = []
+    for addr in (OWNER_EMAIL, CLIENT_BCC):
+        a = (addr or "").strip()
+        if not a or a.lower() == "example@example.com":
+            continue
+        if a.lower() not in {x.lower() for x in out}:
+            out.append(a)
+    return out
+
+
 async def _send_email(payload: dict, label: str, request_id: str) -> dict:
     if DEV_MODE:
         to = payload.get("to", [])
@@ -1943,7 +2149,7 @@ async def _startup_verify_schema() -> None:
 
 
 async def _startup_mail_check() -> None:
-    global _birthday_auto_task, _allowed_emails, _client_profiles, _drafts
+    global _birthday_auto_task, _scheduled_task, _allowed_emails, _client_profiles, _drafts, _scheduled_emails
 
     # 0. Boot-time smoke tests so silent failures surface immediately.
     await _startup_smoke_pdf()
@@ -1970,9 +2176,12 @@ async def _startup_mail_check() -> None:
             db_sessions = await _load_active_sessions_async()
             if db_sessions:
                 _active_sessions.update(db_sessions)
+            db_scheduled = await _load_scheduled_emails_async()
+            if isinstance(db_scheduled, dict):
+                _scheduled_emails = db_scheduled
             logger.info(
-                "Admin state refreshed from postgres: clients=%d emails=%d drafts=%d sessions=%d",
-                len(_client_profiles), len(_allowed_emails), len(_drafts), len(_active_sessions),
+                "Admin state refreshed from postgres: clients=%d emails=%d drafts=%d sessions=%d scheduled=%d",
+                len(_client_profiles), len(_allowed_emails), len(_drafts), len(_active_sessions), len(_scheduled_emails),
             )
         except Exception:
             logger.exception("Admin state refresh from postgres failed; using JSON snapshot")
@@ -1986,17 +2195,21 @@ async def _startup_mail_check() -> None:
         logger.exception("Startup test email failed")
     if _birthday_auto_task is None or _birthday_auto_task.done():
         _birthday_auto_task = asyncio.create_task(_birthday_auto_sender_loop())
+    if _scheduled_task is None or _scheduled_task.done():
+        _scheduled_task = asyncio.create_task(_scheduled_sender_loop())
 
 
 async def _shutdown_background_tasks() -> None:
-    global _birthday_auto_task
-    if _birthday_auto_task is not None:
-        _birthday_auto_task.cancel()
-        try:
-            await _birthday_auto_task
-        except asyncio.CancelledError:
-            pass
-        _birthday_auto_task = None
+    global _birthday_auto_task, _scheduled_task
+    for task_name in ("_birthday_auto_task", "_scheduled_task"):
+        task = globals().get(task_name)
+        if task is not None:
+            task.cancel()
+            try:
+                await task
+            except asyncio.CancelledError:
+                pass
+            globals()[task_name] = None
 
 @app.get("/health")
 async def health() -> dict:
@@ -2101,7 +2314,7 @@ def _welcome_pack_email_html(client_name: str, dog_name: str, service_type: str,
               </td></tr>
             </table>
 
-            <a href="https://onboarding.goodwalk.co.nz/" style="display:inline-block;background:#213021;color:#ffffff;text-decoration:none;border-radius:999px;padding:14px 20px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;font-size:15px;font-weight:700;">
+            <a href="https://clients.goodwalk.co.nz/" style="display:inline-block;background:#213021;color:#ffffff;text-decoration:none;border-radius:999px;padding:14px 20px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;font-size:15px;font-weight:700;">
               Complete onboarding
             </a>
 
@@ -2288,22 +2501,43 @@ def _upcoming_birthday_date(dog_birth_date: str, today: datetime | None = None):
     return candidate
 
 
-async def _send_birthday_email_for_profile(email: str, profile: dict, request_id: str, mark_auto_year: int | None = None, preview: bool = False) -> None:
+def _resolve_preview_recipients(requested: list[str] | None) -> list[str]:
+    allowed = {addr.strip().lower() for addr in CP_ADMIN_EMAILS if addr and addr.strip()}
+    resolved: list[str] = []
+    for raw in requested or []:
+        email = str(raw).strip().lower()
+        if email and email in allowed and email not in resolved:
+            resolved.append(email)
+    if resolved:
+        return resolved
+    owner = OWNER_EMAIL.strip().lower()
+    return [owner] if owner else []
+
+
+async def _send_birthday_email_for_profile(
+    email: str,
+    profile: dict,
+    request_id: str,
+    mark_auto_year: int | None = None,
+    preview: bool = False,
+    preview_recipients: list[str] | None = None,
+) -> None:
     client_name = str(profile.get("fullName", "")).strip()
     dog_name = str(profile.get("dogName", "")).strip()
-    recipient = OWNER_EMAIL.strip().lower() if preview else email
+    recipients = _resolve_preview_recipients(preview_recipients) if preview else [email]
     subject = f"Happy birthday {dog_name or 'from Goodwalk'}"
     if preview:
         subject = f"[PREVIEW for {client_name or email}] {subject}"
     payload = {
         "from": FROM_EMAIL,
-        "to": [recipient],
+        "to": recipients,
         "reply_to": REPLY_TO,
         "subject": subject,
         "html": _birthday_email_html(client_name, dog_name),
     }
-    if CLIENT_BCC and not preview:
-        payload["bcc"] = [CLIENT_BCC]
+    bcc = _client_bcc_list()
+    if bcc and not preview:
+        payload["bcc"] = bcc
 
     await _send_email(payload, label="birthday_email_preview" if preview else "birthday_email", request_id=request_id)
 
@@ -2362,13 +2596,30 @@ _EMAIL_RE = re.compile(r'^[^\s@]+@[^\s@]+\.[^\s@]+$')
 async def auth_request_code(request: Request):
     request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
     ip = _get_ip(request)
-    body = await request.json()
+    raw_body = await request.body()
+    try:
+        body = json.loads(raw_body.decode("utf-8") or "{}")
+    except (UnicodeDecodeError, json.JSONDecodeError):
+        logger.warning(
+            "[%s] auth: invalid json payload ip=%s raw_body=%r",
+            request_id,
+            ip,
+            raw_body[:500],
+        )
+        raise HTTPException(status_code=400, detail="Invalid request payload.")
     email = str(body.get("email", "")).strip().lower()
 
     async with _auth_lock:
         _check_ip_blocked(ip, request_id)
 
     if not email or not _EMAIL_RE.match(email):
+        logger.warning(
+            "[%s] auth: invalid email payload ip=%s body=%r normalized_email=%r",
+            request_id,
+            ip,
+            body,
+            email,
+        )
         raise HTTPException(status_code=400, detail="Please enter a valid email address.")
 
     if email not in _allowed_emails:
@@ -2469,6 +2720,7 @@ async def auth_verify(request: Request):
         "draft": draft,
         "cpAdmin": email in CP_ADMIN_EMAILS,
         "ownerEmail": OWNER_EMAIL,
+        "previewEmails": sorted(CP_ADMIN_EMAILS),
     }
 
 
@@ -3094,12 +3346,11 @@ async def owner_send_message(data: SendMessageRequest, request: Request):
         footer_note=data.footerNote,
         font_id=data.fontId,
     )
-    owner_addr = OWNER_EMAIL.strip().lower()
-
     if is_preview:
+        preview_recipients = _resolve_preview_recipients([str(e) for e in (data.previewRecipients or [])])
         payload = {
             "from": FROM_EMAIL,
-            "to": [owner_addr],
+            "to": preview_recipients,
             "reply_to": REPLY_TO,
             "subject": f"[PREVIEW] {subject}",
             "html": html,
@@ -3114,7 +3365,7 @@ async def owner_send_message(data: SendMessageRequest, request: Request):
     # Real send — always BCC, To: owner. Each recipient sees only owner in To.
     payload = {
         "from": FROM_EMAIL,
-        "to": [owner_addr],
+        "to": [OWNER_EMAIL.strip().lower()],
         "bcc": recipient_emails,
         "reply_to": REPLY_TO,
         "subject": subject,
@@ -3173,6 +3424,101 @@ async def owner_client_enquiry(request: Request):
     return {"ok": True, "enquiry": enquiry, "journey": journey}
 
 
+@app.get("/owner/client-onboarding-view")
+async def owner_client_onboarding_view(request: Request):
+    """Read-only snapshot of a single client's onboarding view, used by the
+    Control Panel "view as client" feature.
+
+    Returns the same ``{email, profile, draft}`` shape the client receives from
+    ``/auth/verify`` so the owner can render an exact replica of what the client
+    sees. This endpoint performs NO writes to client data and never mints a
+    client session — it is purely a read. Any submit from the impersonation
+    run-through is routed to ``/owner/onboarding-preview-submit`` instead, which
+    also never touches the real client."""
+    owner_email = await _require_owner_email(request)
+    email = (request.query_params.get("email") or "").strip().lower()
+    if not email:
+        raise HTTPException(status_code=400, detail="Email is required.")
+    profile = _client_profiles.get(email)
+    if profile is None:
+        raise HTTPException(status_code=404, detail="Client not found.")
+    draft = _drafts.get(email, {})
+    await admin_db.record_event(
+        event_type="owner_client_view",
+        actor_email=owner_email,
+        ip=_get_ip(request),
+        status="ok",
+        detail={"client": email},
+    )
+    return {"ok": True, "email": email, "profile": profile, "draft": draft}
+
+
+@app.post("/owner/onboarding-preview-submit")
+async def owner_onboarding_preview_submit(data: OnboardingSubmission, request: Request):
+    """Owner-only "impersonation preview" submit.
+
+    The owner can walk a client's onboarding all the way to the end. This
+    endpoint renders the onboarding result exactly like a real submission but
+    sends it ONLY to the owner-supplied preview address (``?to=...``). It never
+    writes to the client profile, never emails the client, never registers the
+    address and records no submission — so a full run-through has zero effect on
+    the real client. Skips honeypot/timing/rate-limit checks (owner is trusted
+    and authenticated)."""
+    owner_email = await _require_owner_email(request)
+    request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
+    ip = _get_ip(request)
+    browser = _parse_ua(request.headers.get("user-agent", ""))
+
+    preview_to = (request.query_params.get("to") or "").strip().lower()
+    if not preview_to or not _EMAIL_RE.match(preview_to):
+        raise HTTPException(status_code=400, detail="A valid preview email address is required.")
+
+    _normalize_onboarding_submission(data)
+
+    owner_html = owner_onboarding_email(data, ip, browser)
+    preview_payload = {
+        "from": FROM_EMAIL,
+        "to": [preview_to],
+        "reply_to": REPLY_TO,
+        "subject": f"[PREVIEW] Onboarding run-through — {data.fullName} ({data.dogName})",
+        "html": owner_html,
+    }
+    attachments: list[dict] = []
+    birthday_attachment = _birthday_ics_attachment(data.dogName, data.dogAge, data.fullName, request_id)
+    if birthday_attachment:
+        attachments.append(birthday_attachment)
+    if ONBOARDING_PDF_ATTACHMENT_ENABLED:
+        pdf_html = owner_onboarding_pdf_html(data)
+        pdf_attachment = await _signed_form_pdf_attachment(pdf_html, data.fullName, "onboarding", request_id)
+        if pdf_attachment:
+            attachments.append(pdf_attachment)
+    if attachments:
+        preview_payload["attachments"] = attachments
+
+    try:
+        await _send_email(preview_payload, label="owner_onboarding_preview_email", request_id=request_id)
+    except Exception as exc:
+        logger.error("[%s] onboarding preview email failed: %s", request_id, exc, exc_info=True)
+        raise HTTPException(
+            status_code=502,
+            detail={
+                "request_id": request_id,
+                "message": "The preview could not be delivered. Please try again shortly.",
+            },
+        )
+
+    logger.info(
+        "[%s] onboarding preview sent by owner=%s for client=%s → %s",
+        request_id, owner_email, data.email, preview_to,
+    )
+    await admin_db.record_event(
+        event_type="owner_onboarding_preview",
+        request_id=request_id, actor_email=owner_email, ip=ip, status="ok",
+        detail={"client": str(data.email), "preview_to": preview_to},
+    )
+    return {"ok": True, "request_id": request_id, "preview_to": preview_to}
+
+
 @app.get("/owner/activity")
 async def owner_activity(request: Request):
     await _require_owner_email(request)
@@ -3246,6 +3592,7 @@ async def owner_pending_onboarding(request: Request):
             "email": email,
             "fullName": profile.get("fullName", ""),
             "phone": profile.get("phone", ""),
+            "address": profile.get("address", ""),
             "dogName": profile.get("dogName", ""),
             "dogBreed": profile.get("dogBreed", ""),
             "services": profile.get("services", []) if isinstance(profile.get("services"), list) else [],
@@ -3363,6 +3710,7 @@ async def owner_all_clients(request: Request):
             "email": email,
             "fullName": profile.get("fullName", ""),
             "phone": profile.get("phone", ""),
+            "address": profile.get("address", ""),
             "dogName": profile.get("dogName", ""),
             "dogBreed": profile.get("dogBreed", ""),
             "status": "completed" if profile.get("onboardingCompleted") else "pending",
@@ -3397,6 +3745,170 @@ async def owner_all_clients(request: Request):
     }
 
 
+@app.post("/owner/client-profile")
+async def owner_client_profile(data: ClientProfileUpdate, request: Request):
+    request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
+    owner_email = await _require_owner_email(request)
+
+    full_name = str(data.fullName).strip()
+    dog_name = str(data.dogName).strip()
+    phone = str(data.phone).strip()
+    address = str(data.address).strip()
+    current_email = str(data.email).strip().lower()
+    next_email = str(data.nextEmail).strip().lower()
+
+    if not full_name:
+        raise HTTPException(status_code=400, detail="Please enter the owner name.")
+    if not dog_name:
+        raise HTTPException(status_code=400, detail="Please enter the dog name.")
+
+    profile = await _update_client_profile(
+        current_email,
+        next_email,
+        {
+            "fullName": full_name,
+            "phone": phone,
+            "address": address,
+            "dogName": dog_name,
+        },
+    )
+
+    await admin_db.record_event(
+        event_type="owner_client_profile_updated",
+        request_id=request_id,
+        actor_email=owner_email,
+        ip=_get_ip(request),
+        status="ok",
+        detail={
+            "previousEmail": current_email,
+            "email": next_email,
+            "fullName": full_name,
+            "dogName": dog_name,
+        },
+    )
+
+    return {
+        "ok": True,
+        "client": {
+            "email": next_email,
+            "fullName": profile.get("fullName", ""),
+            "phone": profile.get("phone", ""),
+            "address": profile.get("address", ""),
+            "dogName": profile.get("dogName", ""),
+            "dogBreed": profile.get("dogBreed", ""),
+            "welcomePackSentAt": profile.get("welcomePackSentAt", ""),
+            "welcomePackOffer": profile.get("welcomePackOffer", {}) if isinstance(profile.get("welcomePackOffer"), dict) else {},
+        },
+    }
+
+
+@app.post("/owner/add-client")
+async def owner_add_client(data: NewClientRequest, request: Request):
+    """Create a client by hand (leads from Instagram / Facebook / referrals that
+    never used the public enquiry form). Registers the email in the allowed-users
+    list so the client can sign in to the onboarding form, and seeds a profile."""
+    request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
+    owner_email = await _require_owner_email(request)
+
+    email = str(data.email).strip().lower()
+    full_name = str(data.fullName).strip()
+    phone = str(data.phone).strip()
+    address = str(data.address).strip()
+    dog_name = str(data.dogName).strip()
+    dog_breed = str(data.dogBreed).strip()
+    source = str(data.source).strip()
+
+    if not full_name:
+        raise HTTPException(status_code=400, detail="Please enter the owner name.")
+    if email == OWNER_EMAIL.strip().lower():
+        raise HTTPException(status_code=400, detail="That email is reserved for the business owner.")
+    if email in _client_profiles:
+        raise HTTPException(status_code=409, detail="A client with that email already exists.")
+
+    added_at = datetime.now().isoformat(timespec="seconds")
+
+    # Register the email first so the client can request a login code and reach
+    # the onboarding form, then seed the profile shown across the control panel.
+    await _register_email(email)
+    await _store_client_profile(email, {
+        "fullName": full_name,
+        "phone": phone,
+        "address": address,
+        "dogName": dog_name,
+        "dogBreed": dog_breed,
+        "source": source,
+        # Treated like an enquiry timestamp so the client surfaces in the
+        # pending-onboarding and recent-clients views straight away.
+        "lastEnquiryAt": added_at,
+        "addedByOwnerAt": added_at,
+        "addedBy": owner_email,
+    })
+
+    await admin_db.record_event(
+        event_type="owner_client_added",
+        request_id=request_id,
+        actor_email=owner_email,
+        ip=_get_ip(request),
+        status="ok",
+        detail={"email": email, "fullName": full_name, "source": source or "manual"},
+    )
+
+    # Optional MYOB sync. Never blocks the local client creation: if it is not
+    # configured or the API call fails we surface that in the response and the
+    # owner can retry later, but the client is already saved.
+    myob_result: dict[str, Any] | None = None
+    if data.createInMyob:
+        if not myob.is_configured():
+            myob_result = {"ok": False, "skipped": True, "message": "MYOB integration is not configured."}
+            logger.info("[%s] add-client: MYOB requested but not configured", request_id)
+        else:
+            try:
+                created = await asyncio.to_thread(
+                    myob.create_customer,
+                    email=email,
+                    full_name=full_name,
+                    phone=phone,
+                    street=address,
+                    source=source,
+                )
+                myob_result = {"ok": True, "uid": created.get("uid", "")}
+                await _store_client_profile(email, {
+                    "myobCustomerUid": created.get("uid", ""),
+                    "myobSyncedAt": datetime.now().isoformat(timespec="seconds"),
+                })
+            except Exception as exc:
+                myob_result = {"ok": False, "message": str(exc)}
+                logger.warning("[%s] add-client: MYOB customer create failed: %s", request_id, exc)
+        await admin_db.record_event(
+            event_type="owner_client_myob_sync",
+            request_id=request_id,
+            actor_email=owner_email,
+            ip=_get_ip(request),
+            status="ok" if myob_result.get("ok") else "error",
+            detail={"email": email, **myob_result},
+        )
+
+    profile = _client_profiles.get(email, {})
+    lifecycle = profile.get("lifecycle") if isinstance(profile.get("lifecycle"), dict) else None
+
+    return {
+        "ok": True,
+        "myob": myob_result,
+        "client": {
+            "email": email,
+            "fullName": profile.get("fullName", ""),
+            "phone": profile.get("phone", ""),
+            "address": profile.get("address", ""),
+            "dogName": profile.get("dogName", ""),
+            "dogBreed": profile.get("dogBreed", ""),
+            "status": "completed" if profile.get("onboardingCompleted") else "pending",
+            "lifecycle": lifecycle or {"status": "active", "reason": "", "changedAt": "", "changedBy": ""},
+            "lastActivityAt": profile.get("lastEnquiryAt", ""),
+            "welcomePackSentAt": profile.get("welcomePackSentAt", ""),
+        },
+    }
+
+
 @app.get("/owner/birthdays")
 async def owner_birthdays(request: Request):
     await _require_owner_email(request)
@@ -3494,6 +4006,193 @@ async def owner_birthday_ics(request: Request):
     )
 
 
+def _default_welcome_subject(dog_name: str) -> str:
+    """The fallback subject when the owner leaves the field blank."""
+    name = (dog_name or "").strip()
+    return f"Goodwalk Onboarding - {name}" if name else "Goodwalk Onboarding"
+
+
+def _welcome_pack_payload(
+    email: str,
+    owner_name: str,
+    dog_name: str,
+    service: str,
+    price: str,
+    start: str,
+    *,
+    subject: str,
+    is_preview: bool,
+    recipients: list[str],
+) -> dict:
+    """Assemble the Resend payload for a welcome-pack email. Shared by the
+    immediate send, the preview path, and the scheduled-email worker."""
+    subject = (subject or "").strip() or _default_welcome_subject(dog_name)
+    if is_preview:
+        subject = f"[PREVIEW for {owner_name or email}] {subject}"
+    payload = {
+        "from": FROM_EMAIL,
+        "to": recipients,
+        "reply_to": REPLY_TO,
+        "subject": subject,
+        "html": _welcome_pack_email_html(owner_name, dog_name, service, price, start),
+    }
+    bcc = _client_bcc_list()
+    if bcc and not is_preview:
+        payload["bcc"] = bcc
+    return payload
+
+
+async def _deliver_welcome_pack(
+    email: str,
+    profile: dict,
+    service: str,
+    price: str,
+    start: str,
+    subject: str,
+    request_id: str,
+) -> str:
+    """Send the welcome pack to the client now and record it on the profile.
+    Returns the sentAt timestamp. Raises on send failure (caller decides how to
+    surface it). Used by both the live endpoint and the scheduled worker so the
+    two paths can never drift apart."""
+    owner_name = str(profile.get("fullName", "")).strip()
+    dog_name = str(profile.get("dogName", "")).strip()
+    sent_at = datetime.now().isoformat(timespec="seconds")
+    payload = _welcome_pack_payload(
+        email, owner_name, dog_name, service, price, start,
+        subject=subject, is_preview=False, recipients=[email],
+    )
+    await _send_email(payload, label="welcome_pack_email", request_id=request_id)
+    await _store_client_profile(email, {
+        "welcomePackSentAt": sent_at,
+        "welcomePackOffer": {
+            "serviceType": service,
+            "priceDetails": price,
+            "startDate": start,
+            "sentAt": sent_at,
+        },
+    })
+    return sent_at
+
+
+async def _enqueue_scheduled_welcome(
+    *,
+    email: str,
+    profile: dict,
+    service: str,
+    price: str,
+    start: str,
+    subject: str,
+    scheduled_for: datetime,
+    owner_email: str,
+) -> dict:
+    """Add a welcome email to the durable queue for later delivery."""
+    entry_id = uuid.uuid4().hex
+    entry = {
+        "id": entry_id,
+        "kind": "welcome",
+        "email": email,
+        "subject": subject,
+        "serviceType": service,
+        "priceDetails": price,
+        "startDate": start,
+        "clientName": str(profile.get("fullName", "")).strip(),
+        "dogName": str(profile.get("dogName", "")).strip(),
+        "scheduledFor": scheduled_for.isoformat(timespec="minutes"),
+        "status": "pending",
+        "attempts": 0,
+        "createdAt": datetime.now().isoformat(timespec="seconds"),
+        "createdBy": owner_email,
+        "sentAt": None,
+        "lastError": None,
+    }
+    async with _scheduled_lock:
+        _scheduled_emails[entry_id] = entry
+        await _persist_scheduled_emails()
+    return entry
+
+
+async def _run_scheduled_sender_once() -> None:
+    """Dispatch any scheduled emails that have come due. Successful sends are
+    marked 'sent'; transient failures stay 'pending' and retry on later ticks
+    until MAX_SEND_ATTEMPTS, after which they're marked 'failed'."""
+    now = datetime.now()
+    due_ids: list[str] = []
+    for entry in list(_scheduled_emails.values()):
+        if entry.get("status") != "pending":
+            continue
+        try:
+            when = datetime.fromisoformat(str(entry.get("scheduledFor")))
+        except ValueError:
+            continue
+        if when.tzinfo is not None:
+            when = when.astimezone().replace(tzinfo=None)
+        if when <= now:
+            due_ids.append(str(entry.get("id")))
+
+    for entry_id in due_ids:
+        entry = _scheduled_emails.get(entry_id)
+        if not entry or entry.get("status") != "pending":
+            continue
+        email = str(entry.get("email", "")).strip().lower()
+        profile = _client_profiles.get(email, {})
+        request_id = f"sched-{entry_id[:6]}"
+
+        # Guard against stale schedules: the client may have been removed or
+        # completed onboarding between scheduling and the send time.
+        if not profile:
+            entry["status"] = "failed"
+            entry["lastError"] = "Client profile no longer exists."
+        elif profile.get("onboardingCompleted"):
+            entry["status"] = "cancelled"
+            entry["lastError"] = "Client completed onboarding before the scheduled time."
+        else:
+            try:
+                sent_at = await _deliver_welcome_pack(
+                    email, profile,
+                    str(entry.get("serviceType", "")),
+                    str(entry.get("priceDetails", "")),
+                    str(entry.get("startDate", "")),
+                    str(entry.get("subject", "")),
+                    request_id,
+                )
+                entry["status"] = "sent"
+                entry["sentAt"] = sent_at
+                entry["attempts"] = int(entry.get("attempts", 0)) + 1
+                entry["lastError"] = None
+                logger.info("[%s] scheduled welcome sent: email=%s", request_id, email)
+                await admin_db.record_event(
+                    event_type="owner_welcome_pack_sent",
+                    request_id=request_id, actor_email=entry.get("createdBy"), status="ok",
+                    detail={"recipient": email, "scheduled": True, "scheduledFor": entry.get("scheduledFor")},
+                )
+            except Exception as exc:
+                attempts = int(entry.get("attempts", 0)) + 1
+                entry["attempts"] = attempts
+                entry["lastError"] = f"{type(exc).__name__}: {exc}"
+                if attempts >= MAX_SEND_ATTEMPTS:
+                    entry["status"] = "failed"
+                    logger.error("[%s] scheduled welcome failed permanently after %d attempt(s): %s",
+                                 request_id, attempts, exc, exc_info=True)
+                else:
+                    logger.warning("[%s] scheduled welcome attempt %d failed, will retry: %s",
+                                   request_id, attempts, exc)
+
+        async with _scheduled_lock:
+            await _persist_scheduled_emails()
+
+
+async def _scheduled_sender_loop() -> None:
+    while True:
+        try:
+            await _run_scheduled_sender_once()
+        except asyncio.CancelledError:
+            raise
+        except Exception:
+            logger.exception("Scheduled sender loop failed")
+        await asyncio.sleep(SCHEDULED_CHECK_INTERVAL_SECONDS)
+
+
 @app.post("/owner/send-welcome-pack")
 async def owner_send_welcome_pack(data: WelcomePackEmailRequest, request: Request):
     request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
@@ -3513,27 +4212,55 @@ async def owner_send_welcome_pack(data: WelcomePackEmailRequest, request: Reques
     if not _trimmed(data.startDate):
         raise HTTPException(status_code=400, detail="Please enter a start date.")
 
-    owner_name = str(profile.get("fullName", "")).strip()
-    dog_name = str(profile.get("dogName", "")).strip()
-    sent_at = datetime.now().isoformat(timespec="seconds")
+    service = _trimmed(data.serviceType)
+    price = _trimmed(data.priceDetails)
+    start = _trimmed(data.startDate)
+    subject = _trimmed(data.subject) or _default_welcome_subject(str(profile.get("dogName", "")))
     is_preview = bool(data.preview)
-    recipient = OWNER_EMAIL.strip().lower() if is_preview else email
-    subject = "Welcome to the pack | Goodwalk"
-    if is_preview:
-        subject = f"[PREVIEW for {owner_name or email}] {subject}"
 
-    payload = {
-        "from": FROM_EMAIL,
-        "to": [recipient],
-        "reply_to": REPLY_TO,
-        "subject": subject,
-        "html": _welcome_pack_email_html(owner_name, dog_name, _trimmed(data.serviceType), _trimmed(data.priceDetails), _trimmed(data.startDate)),
-    }
-    if CLIENT_BCC and not is_preview:
-        payload["bcc"] = [CLIENT_BCC]
+    # Scheduled send: queue it for the worker rather than sending now. Previews
+    # are always immediate — there's nothing to schedule about a test email.
+    if data.scheduledFor and not is_preview:
+        when = _parse_schedule_datetime(data.scheduledFor)
+        if when <= datetime.now():
+            raise HTTPException(status_code=400, detail="Please choose a time in the future to schedule the email.")
+        entry = await _enqueue_scheduled_welcome(
+            email=email, profile=profile, service=service, price=price, start=start,
+            subject=subject, scheduled_for=when, owner_email=owner_email,
+        )
+        logger.info("[%s] welcome pack scheduled: email=%s for=%s id=%s", request_id, email, entry["scheduledFor"], entry["id"])
+        await admin_db.record_event(
+            event_type="owner_welcome_pack_scheduled",
+            request_id=request_id, actor_email=owner_email, ip=_get_ip(request), status="ok",
+            detail={"recipient": email, "serviceType": service, "scheduledFor": entry["scheduledFor"], "id": entry["id"]},
+        )
+        return {"ok": True, "scheduled": True, "id": entry["id"], "scheduledFor": entry["scheduledFor"]}
+
+    if is_preview:
+        owner_name = str(profile.get("fullName", "")).strip()
+        dog_name = str(profile.get("dogName", "")).strip()
+        recipients = _resolve_preview_recipients([str(e) for e in (data.previewRecipients or [])])
+        payload = _welcome_pack_payload(
+            email, owner_name, dog_name, service, price, start,
+            subject=subject, is_preview=True, recipients=recipients,
+        )
+        try:
+            await _send_email(payload, label="welcome_pack_email_preview", request_id=request_id)
+        except Exception as exc:
+            logger.error("[%s] welcome pack preview failed: %s", request_id, exc, exc_info=True)
+            raise HTTPException(
+                status_code=502,
+                detail={
+                    "request_id": request_id,
+                    "message": "The welcome email could not be sent. Please try again shortly.",
+                    "error_type": type(exc).__name__,
+                },
+            )
+        logger.info("[%s] welcome pack PREVIEW sent: original_recipient=%s -> owner", request_id, email)
+        return {"ok": True, "sentAt": datetime.now().isoformat(timespec="seconds"), "preview": True}
 
     try:
-        await _send_email(payload, label="welcome_pack_email_preview" if is_preview else "welcome_pack_email", request_id=request_id)
+        sent_at = await _deliver_welcome_pack(email, profile, service, price, start, subject, request_id)
     except Exception as exc:
         logger.error("[%s] welcome pack email failed: %s", request_id, exc, exc_info=True)
         raise HTTPException(
@@ -3545,33 +4272,97 @@ async def owner_send_welcome_pack(data: WelcomePackEmailRequest, request: Reques
             },
         )
 
-    if is_preview:
-        logger.info("[%s] welcome pack PREVIEW sent: original_recipient=%s -> owner", request_id, email)
-        return {"ok": True, "sentAt": sent_at, "preview": True}
-
-    await _store_client_profile(email, {
-        "welcomePackSentAt": sent_at,
-        "welcomePackOffer": {
-            "serviceType": _trimmed(data.serviceType),
-            "priceDetails": _trimmed(data.priceDetails),
-            "startDate": _trimmed(data.startDate),
-            "sentAt": sent_at,
-        },
-    })
-
     logger.info("[%s] welcome pack sent: email=%s service=%s start=%s", request_id, email, data.serviceType, data.startDate)
     await admin_db.record_event(
         event_type="owner_welcome_pack_sent",
         request_id=request_id, actor_email=owner_email, ip=_get_ip(request), status="ok",
         detail={
             "recipient": email,
-            "serviceType": _trimmed(data.serviceType),
-            "startDate": _trimmed(data.startDate),
+            "serviceType": service,
+            "startDate": start,
         },
     )
     return {"ok": True, "sentAt": sent_at}
 
 
+def _scheduled_email_view(entry: dict) -> dict:
+    """Public shape of a scheduled-email record for the owner dashboard."""
+    return {
+        "id": entry.get("id"),
+        "kind": entry.get("kind", "welcome"),
+        "email": entry.get("email"),
+        "clientName": entry.get("clientName", ""),
+        "dogName": entry.get("dogName", ""),
+        "serviceType": entry.get("serviceType", ""),
+        "priceDetails": entry.get("priceDetails", ""),
+        "startDate": entry.get("startDate", ""),
+        "scheduledFor": entry.get("scheduledFor"),
+        "status": entry.get("status", "pending"),
+        "attempts": int(entry.get("attempts", 0)),
+        "createdAt": entry.get("createdAt"),
+        "sentAt": entry.get("sentAt"),
+        "lastError": entry.get("lastError"),
+    }
+
+
+@app.get("/owner/scheduled-emails")
+async def owner_list_scheduled_emails(request: Request):
+    await _require_owner_email(request)
+    pending = []
+    history = []
+    for entry in _scheduled_emails.values():
+        view = _scheduled_email_view(entry)
+        (pending if view["status"] == "pending" else history).append(view)
+    # Pending: soonest first. History: most recently scheduled first.
+    pending.sort(key=lambda e: str(e.get("scheduledFor") or ""))
+    history.sort(key=lambda e: str(e.get("scheduledFor") or ""), reverse=True)
+    return {"ok": True, "pending": pending, "history": history}
+
+
+@app.post("/owner/scheduled-emails/cancel")
+async def owner_cancel_scheduled_email(data: ScheduledEmailCancelRequest, request: Request):
+    owner_email = await _require_owner_email(request)
+    async with _scheduled_lock:
+        entry = _scheduled_emails.get(data.id)
+        if not entry:
+            raise HTTPException(status_code=404, detail="That scheduled email no longer exists.")
+        if entry.get("status") != "pending":
+            raise HTTPException(status_code=400, detail="Only a pending scheduled email can be cancelled.")
+        entry["status"] = "cancelled"
+        entry["lastError"] = None
+        await _persist_scheduled_emails()
+    logger.info("scheduled welcome cancelled: id=%s by=%s", data.id, owner_email)
+    await admin_db.record_event(
+        event_type="owner_scheduled_email_cancelled",
+        actor_email=owner_email, ip=_get_ip(request), status="ok",
+        detail={"id": data.id, "recipient": entry.get("email")},
+    )
+    return {"ok": True, "scheduled": _scheduled_email_view(entry)}
+
+
+@app.post("/owner/scheduled-emails/reschedule")
+async def owner_reschedule_scheduled_email(data: ScheduledEmailRescheduleRequest, request: Request):
+    owner_email = await _require_owner_email(request)
+    when = _parse_schedule_datetime(data.scheduledFor)
+    if when <= datetime.now():
+        raise HTTPException(status_code=400, detail="Please choose a time in the future.")
+    async with _scheduled_lock:
+        entry = _scheduled_emails.get(data.id)
+        if not entry:
+            raise HTTPException(status_code=404, detail="That scheduled email no longer exists.")
+        if entry.get("status") != "pending":
+            raise HTTPException(status_code=400, detail="Only a pending scheduled email can be rescheduled.")
+        entry["scheduledFor"] = when.isoformat(timespec="minutes")
+        await _persist_scheduled_emails()
+    logger.info("scheduled welcome rescheduled: id=%s for=%s by=%s", data.id, entry["scheduledFor"], owner_email)
+    await admin_db.record_event(
+        event_type="owner_scheduled_email_rescheduled",
+        actor_email=owner_email, ip=_get_ip(request), status="ok",
+        detail={"id": data.id, "recipient": entry.get("email"), "scheduledFor": entry["scheduledFor"]},
+    )
+    return {"ok": True, "scheduled": _scheduled_email_view(entry)}
+
+
 @app.post("/owner/send-birthday-email")
 async def owner_send_birthday_email(data: BirthdayEmailRequest, request: Request):
     request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
@@ -3586,7 +4377,13 @@ async def owner_send_birthday_email(data: BirthdayEmailRequest, request: Request
         raise HTTPException(status_code=400, detail="This client does not have a valid dog birthday on file.")
 
     try:
-        await _send_birthday_email_for_profile(email, profile, request_id, preview=bool(data.preview))
+        await _send_birthday_email_for_profile(
+            email,
+            profile,
+            request_id,
+            preview=bool(data.preview),
+            preview_recipients=[str(e) for e in (data.previewRecipients or [])],
+        )
     except Exception as exc:
         logger.error("[%s] birthday email failed: %s", request_id, exc, exc_info=True)
         raise HTTPException(
@@ -3656,6 +4453,48 @@ async def owner_client_status(data: ClientStatusUpdate, request: Request):
     return {"ok": True, "email": email, "lifecycle": lifecycle}
 
 
+@app.post("/owner/reset-onboarding")
+async def owner_reset_onboarding(data: ResetOnboardingRequest, request: Request):
+    """Reset a client's onboarding while keeping all their saved details.
+
+    For clients imported from the legacy Gravity Forms data: keeps their contact
+    and dog details (archiving any prior submission) but returns them to the
+    pending list so they can sign in with their email and complete the new form.
+    """
+    request_id = getattr(request.state, "request_id", uuid.uuid4().hex[:8])
+    owner_email = await _require_owner_email(request)
+
+    email = str(data.email).strip().lower()
+    updated = await _reset_client_onboarding(email)
+    # Make sure the email is registered so they can request a login code even if
+    # it was somehow missing from the allowed list after the legacy import.
+    await _register_email(email)
+
+    await admin_db.record_event(
+        event_type="owner_onboarding_reset",
+        request_id=request_id, actor_email=owner_email, ip=_get_ip(request), status="ok",
+        detail={"clientEmail": email},
+    )
+    logger.info("[%s] owner: %s reset onboarding for %s", request_id, owner_email, email)
+
+    lifecycle = updated.get("lifecycle") if isinstance(updated.get("lifecycle"), dict) else None
+    return {
+        "ok": True,
+        "client": {
+            "email": email,
+            "fullName": updated.get("fullName", ""),
+            "phone": updated.get("phone", ""),
+            "address": updated.get("address", ""),
+            "dogName": updated.get("dogName", ""),
+            "dogBreed": updated.get("dogBreed", ""),
+            "status": "pending",
+            "lifecycle": lifecycle or {"status": "active", "reason": "", "changedAt": "", "changedBy": ""},
+            "lastActivityAt": updated.get("lastEnquiryAt", "") or updated.get("welcomePackSentAt", ""),
+            "welcomePackSentAt": updated.get("welcomePackSentAt", ""),
+        },
+    }
+
+
 @app.post("/owner/birthday-auto-send")
 async def owner_birthday_auto_send(data: BirthdayAutoSendRequest, request: Request):
     owner_email = await _require_owner_email(request)
@@ -3734,8 +4573,9 @@ async def submit_booking(data: BookingSubmission, request: Request):
         "subject": f"We received your {'general enquiry' if _is_general_enquiry(data) else 'enquiry'}, {first_name}! 🐾",
         "html": client_email(data),
     }
-    if CLIENT_BCC:
-        client_payload["bcc"] = [CLIENT_BCC]
+    client_bcc = _client_bcc_list()
+    if client_bcc:
+        client_payload["bcc"] = client_bcc
 
     try:
         await _send_email(
@@ -4113,6 +4953,9 @@ async def submit_onboarding(data: OnboardingSubmission, request: Request):
         "dogName": data.dogName,
         "dogBreed": data.dogBreed,
         "dogAge": data.dogAge,
+        "vetAddress": data.vetAddress,
+        "regularFleaTickTreatment": data.regularFleaTickTreatment,
+        "petInsurance": data.petInsurance,
         "onboardingCompleted": True,
         "onboardingSubmittedAt": datetime.now().isoformat(timespec="seconds"),
         "onboardingSubmission": data.submissionSnapshot,
@@ -4125,8 +4968,9 @@ async def submit_onboarding(data: OnboardingSubmission, request: Request):
         "subject": f"Your Goodwalk onboarding is complete, {data.fullName.split()[0]}",
         "html": _onboarding_confirmation_email_html(data),
     }
-    if CLIENT_BCC:
-        client_payload["bcc"] = [CLIENT_BCC]
+    client_bcc = _client_bcc_list()
+    if client_bcc:
+        client_payload["bcc"] = client_bcc
 
     try:
         await _send_email(
diff --git a/mail-api/requirements.txt b/mail-api/requirements.txt
index 8830482..d969508 100644
--- a/mail-api/requirements.txt
+++ b/mail-api/requirements.txt
@@ -4,3 +4,4 @@ resend>=2.0
 pydantic[email]>=2.10
 asyncpg>=0.30
 weasyprint>=63
+requests>=2.32
diff --git a/mail-api/start-dev.ps1 b/mail-api/start-dev.ps1
new file mode 100644
index 0000000..a5d793e
--- /dev/null
+++ b/mail-api/start-dev.ps1
@@ -0,0 +1,15 @@
+$ErrorActionPreference = 'Stop'
+
+Set-Location $PSScriptRoot
+
+$env:DEV_MODE = '1'
+if (-not $env:OWNER_EMAIL) {
+  $env:OWNER_EMAIL = 'info@goodwalk.co.nz'
+}
+
+$python = Join-Path $PSScriptRoot '.venv\Scripts\python.exe'
+if (-not (Test-Path $python)) {
+  throw "Missing virtualenv interpreter at $python. Create it first with: py -3.14 -m venv .venv"
+}
+
+& $python -m uvicorn main:app --host 127.0.0.1 --port 8000 --reload
diff --git a/nginx/maintenance.html b/nginx/maintenance.html
index 349392b..1b90ded 100644
--- a/nginx/maintenance.html
+++ b/nginx/maintenance.html
@@ -4,14 +4,19 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex" />
-    <title>Be right back | Goodwalk</title>
+    <title>Back soon | Goodwalk</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Readex+Pro:wght@400;500&family=Unbounded:wght@700;800&display=swap"
+      rel="stylesheet"
+    />
     <style>
       :root {
         --green: #213021;
-        --green-soft: #2c3f2c;
         --yellow: #ffd100;
-        --ink: #1a1a1a;
-        --muted: #4c5056;
+        --off-white: #f8f7f2;
+        --line: rgba(255, 255, 255, 0.16);
       }
 
       * {
@@ -21,166 +26,83 @@
       html,
       body {
         margin: 0;
-        padding: 0;
-        height: 100%;
+        min-height: 100%;
       }
 
       body {
-        font-family: ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-        color: var(--ink);
-        background:
-          radial-gradient(circle at top left, rgba(255, 209, 0, 0.12), transparent 55%),
-          radial-gradient(circle at bottom right, rgba(255, 209, 0, 0.08), transparent 60%),
-          var(--green);
-        min-height: 100vh;
         display: grid;
         place-items: center;
-        padding: 32px;
-        line-height: 1.5;
+        padding: 24px;
+        background: var(--green);
+        color: var(--off-white);
+        font-family: "Readex Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif;
+        line-height: 1.6;
       }
 
-      .stage {
-        width: 100%;
-        max-width: 560px;
-      }
-
-      .brand-bar {
-        display: flex;
-        justify-content: center;
-        margin-bottom: 28px;
-      }
-
-      .brand-bar img {
-        display: block;
-        height: 44px;
-        width: auto;
-        max-width: 100%;
-        filter: brightness(0) invert(1);
-      }
-
-      .card {
-        position: relative;
-        background: #fff;
-        border-radius: 28px;
-        padding: 44px 40px 38px;
-        box-shadow: 0 24px 60px rgba(0, 0, 0, 0.25);
+      main {
+        width: min(100%, 30rem);
         text-align: center;
-        overflow: hidden;
       }
 
-      .card::before {
-        content: "";
-        position: absolute;
-        inset: 0 0 auto 0;
-        height: 6px;
-        background: var(--yellow);
-      }
-
-      .paw {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        width: 64px;
-        height: 64px;
-        margin: 4px auto 18px;
-        border-radius: 50%;
-        background: rgba(33, 48, 33, 0.08);
-        color: var(--green);
-      }
-
-      .paw svg {
-        width: 32px;
-        height: 32px;
-      }
-
-      .eyebrow {
-        font-size: 12px;
-        font-weight: 700;
-        letter-spacing: 0.18em;
-        text-transform: uppercase;
-        color: var(--green);
-        margin: 0 0 10px;
+      .logo {
+        height: 36px;
+        width: auto;
+        margin-bottom: 40px;
       }
 
       h1 {
-        margin: 0 0 14px;
-        font-size: clamp(28px, 4vw, 38px);
+        margin: 0 0 16px;
+        font-family: "Unbounded", sans-serif;
+        font-size: clamp(1.6rem, 5vw, 2.1rem);
+        font-weight: 800;
         line-height: 1.1;
-        letter-spacing: -0.02em;
-        color: var(--ink);
+        letter-spacing: -0.03em;
+        color: var(--off-white);
       }
 
       p {
-        margin: 0 0 12px;
-        color: var(--muted);
-        font-size: 16px;
+        margin: 0 auto;
+        max-width: 26rem;
+        color: rgba(248, 247, 242, 0.82);
+        font-size: 1rem;
       }
 
-      .meta {
-        margin-top: 24px;
-        padding-top: 22px;
-        border-top: 1px solid rgba(17, 20, 24, 0.08);
-        font-size: 14px;
-        color: var(--muted);
+      .contact {
+        margin-top: 32px;
+        padding-top: 28px;
+        border-top: 1px solid var(--line);
+        font-size: 0.95rem;
+        color: rgba(248, 247, 242, 0.7);
       }
 
-      .meta a {
-        color: var(--green);
-        font-weight: 700;
+      .contact a {
+        color: var(--yellow);
+        font-weight: 500;
         text-decoration: none;
+        border-bottom: 1px solid rgba(255, 209, 0, 0.4);
+        padding-bottom: 1px;
       }
 
-      .meta a:hover {
-        text-decoration: underline;
-      }
-
-      .footnote {
-        margin-top: 22px;
-        text-align: center;
-        font-size: 13px;
-        color: rgba(255, 255, 255, 0.7);
-      }
-
-      @media (max-width: 480px) {
-        .card {
-          padding: 36px 24px 28px;
-          border-radius: 22px;
-        }
-
-        .brand-bar img {
-          height: 36px;
-        }
+      .contact a:hover {
+        border-bottom-color: var(--yellow);
       }
     </style>
   </head>
   <body>
-    <div class="stage">
-      <div class="brand-bar">
-        <img src="/m/logo.png" alt="Goodwalk" width="241" height="48" />
-      </div>
-
-      <main class="card" role="main">
-        <span class="paw" aria-hidden="true">
-          <svg viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path d="M7.5 10.5c1.1 0 2-1.3 2-3s-.9-3-2-3-2 1.3-2 3 .9 3 2 3Zm9 0c1.1 0 2-1.3 2-3s-.9-3-2-3-2 1.3-2 3 .9 3 2 3ZM4 13.5c1 0 1.8-1.1 1.8-2.5S5 8.5 4 8.5s-1.8 1.1-1.8 2.5S3 13.5 4 13.5Zm16 0c1 0 1.8-1.1 1.8-2.5S21 8.5 20 8.5s-1.8 1.1-1.8 2.5.8 2.5 1.8 2.5ZM12 13.5c-3.3 0-6 2.5-6 5.4 0 1.4 1.1 2.6 2.5 2.6 1 0 1.5-.4 2.2-.8.4-.2.8-.4 1.3-.4s.9.2 1.3.4c.7.4 1.2.8 2.2.8 1.4 0 2.5-1.2 2.5-2.6 0-2.9-2.7-5.4-6-5.4Z"/>
-          </svg>
-        </span>
-
-        <p class="eyebrow">Goodwalk</p>
-        <h1>Be right back!</h1>
-        <p>We're updating the site — should only take a minute. Thanks for your patience.</p>
-
-        <div class="meta">
-          Need us now? Email <a href="mailto:info@goodwalk.co.nz">info@goodwalk.co.nz</a>
-          or call <a href="tel:+64226421011">(022) 642 1011</a>.
-        </div>
-      </main>
-
-      <p class="footnote">Auckland Central dog walking · Tiny Gang pack walks · 1:1 walks · Puppy visits</p>
-    </div>
+    <main>
+      <img class="logo" src="/m/logo.png" alt="Goodwalk" width="241" height="48" />
+      <h1>Back on the lead shortly</h1>
+      <p>
+        We’re making a few quick updates. The site will be back to normal in a moment — thanks for your patience.
+      </p>
+      <p class="contact">
+        Need us now? Email
+        <a href="mailto:info@goodwalk.co.nz">info@goodwalk.co.nz</a>
+        or call <a href="tel:+64226421011">(022) 642 1011</a>.
+      </p>
+    </main>
 
     <script>
-      // Auto-recheck once a minute so visitors don't sit on this page forever.
       setTimeout(function () {
         window.location.reload();
       }, 60000);
diff --git a/package.json b/package.json
index cf9c349..1e06856 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gw-svelte",
-  "version": "4.0.1",
+  "version": "4.0.5",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/scripts/deploy-remote.sh b/scripts/deploy-remote.sh
index 5c06ec4..67d9bfc 100644
--- a/scripts/deploy-remote.sh
+++ b/scripts/deploy-remote.sh
@@ -277,6 +277,17 @@ if [[ -f "$DEPLOY_PATH/.env" ]]; then
   echo "[deploy-remote] Preserving existing $DEPLOY_PATH/.env"
 fi
 
+# The application source tree is fully owned by the repo and is only used as
+# Docker build context — it holds no runtime data. The rsync below uses no
+# --delete, so a file removed or renamed in the repo (e.g. a moved SvelteKit
+# route) would otherwise linger here and break the build with a route conflict.
+# Wipe src/ first so it is rebuilt exactly from the archive. Runtime data,
+# .env, and Docker volumes live outside src/ and are untouched.
+if [[ -d "$DEPLOY_PATH/src" ]]; then
+  echo "[deploy-remote] Refreshing $DEPLOY_PATH/src from archive (pruning stale files)"
+  rm -rf "$DEPLOY_PATH/src"
+fi
+
 echo "[deploy-remote] Copying application files into $DEPLOY_PATH"
 if command -v rsync >/dev/null 2>&1; then
   rsync -a \
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index f056da8..543624f 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,4 +1,5 @@
 import type { Handle } from '@sveltejs/kit';
+import { dev } from '$app/environment';
 import { resolveSurface } from '$lib/server/surface';
 import { resolveAnonId, resolveHeroVariant } from '$lib/server/ab';
 
@@ -16,8 +17,12 @@ export const handle: Handle = async ({ event, resolve }) => {
     event.locals.abHero = resolveHeroVariant(event.url, event.cookies);
   }
 
-  // The admin host (cp.*) serves the dashboard at its root.
-  if (surface === 'cp' && (path === '/' || path === '')) {
+  // The admin host (cp.*) serves the dashboard at its root. In production the
+  // universal `reroute` hook maps / (and /clients, /birthdays, …) onto the
+  // internal /owner/welcome routes without changing the URL. In dev the cp
+  // surface is reached via ?preview=cp on localhost, where reroute can't detect
+  // the host, so fall back to redirecting the root to the dashboard path.
+  if (dev && surface === 'cp' && (path === '/' || path === '')) {
     return new Response(null, {
       status: 302,
       headers: { location: ADMIN_PATH },
diff --git a/src/hooks.ts b/src/hooks.ts
new file mode 100644
index 0000000..8eade86
--- /dev/null
+++ b/src/hooks.ts
@@ -0,0 +1,31 @@
+import type { Reroute } from '@sveltejs/kit';
+
+/**
+ * Clean URLs for the control panel.
+ *
+ * The owner dashboard lives internally at /owner/welcome (home) and
+ * /owner/welcome/<tab>. On the cp.* / admin.* hosts we serve it at the root so
+ * the visible URLs are /, /clients, /birthdays, /messaging, /scheduled and
+ * /activity. This hook rewrites those clean paths to the real route without
+ * changing the URL in the browser, and runs on both the server and the client
+ * so SSR and client-side navigation stay in sync.
+ *
+ * Keep CP_HOSTS in sync with $lib/server/surface.ts — it can't be imported here
+ * because this hook also runs in the browser and $lib/server is server-only.
+ */
+const CP_HOSTS = new Set(['cp.goodwalk.co.nz', 'admin.goodwalk.co.nz']);
+const ADMIN_BASE = '/owner/welcome';
+const CP_TABS = new Set(['clients', 'birthdays', 'messaging', 'scheduled', 'activity']);
+
+export const reroute: Reroute = ({ url }) => {
+  if (!CP_HOSTS.has(url.hostname.toLowerCase())) return;
+
+  // Already addressing the internal admin routes (e.g. a direct hit) — leave it.
+  if (url.pathname === ADMIN_BASE || url.pathname.startsWith(`${ADMIN_BASE}/`)) return;
+
+  const segment = url.pathname.replace(/^\/+/, '').split('/')[0];
+  if (segment === '') return ADMIN_BASE; // / → dashboard home
+  if (CP_TABS.has(segment)) return `${ADMIN_BASE}/${segment}`;
+
+  // Anything else (static assets, /owner/experiments, …) routes normally.
+};
diff --git a/src/lib/components/admin-dashboard/AdminDashboard.svelte b/src/lib/components/admin-dashboard/AdminDashboard.svelte
index 3a1e54d..509a0a2 100644
--- a/src/lib/components/admin-dashboard/AdminDashboard.svelte
+++ b/src/lib/components/admin-dashboard/AdminDashboard.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import OnboardingAuth from '$lib/components/OnboardingAuth.svelte';
+  import { page } from '$app/stores';
+  import { goto } from '$app/navigation';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import OnboardingAuth from '$lib/components/sections/OnboardingAuth.svelte';
+  import OnboardingPage from '$lib/components/pages/OnboardingPage.svelte';
   import logoDesktop from '$lib/images/goodwalk-auckland-dog-walking-logo.png?enhanced';
   import type { Picture } from '@sveltejs/enhanced-img';
 
@@ -13,6 +16,7 @@
     email: string;
     fullName: string;
     phone: string;
+    address: string;
     dogName: string;
     dogBreed: string;
     services: string[];
@@ -39,6 +43,7 @@
     email: string;
     fullName: string;
     phone: string;
+    address: string;
     dogName: string;
     dogBreed: string;
     status: 'pending' | 'completed';
@@ -75,8 +80,49 @@
   let userEmail = '';
   let accessDenied = false;
   let ownerEmail = 'info@goodwalk.co.nz';
+  let previewEmails: string[] = [];
+  let welcomePreviewDraft = false;
+  let selectedPreviewEmails = new Set<string>();
 
-  let activeTab: 'home' | 'clients' | 'birthdays' | 'messaging' | 'activity' = 'home';
+  type OwnerTab = 'home' | 'clients' | 'birthdays' | 'messaging' | 'scheduled' | 'activity';
+
+  // The dashboard lives at /owner/welcome internally, but on the cp.* host nginx
+  // + the `reroute` hook serve the tabs at clean paths (/ , /clients, …). We work
+  // out which mode we're in from the current pathname so links resolve correctly
+  // in both: prefixed (/owner/welcome/clients) for dev/direct access, and clean
+  // (/clients) on the control-panel host.
+  const ADMIN_BASE = '/owner/welcome';
+  const TAB_SEGMENTS: Record<OwnerTab, string> = {
+    home: '',
+    clients: 'clients',
+    birthdays: 'birthdays',
+    messaging: 'messaging',
+    scheduled: 'scheduled',
+    activity: 'activity',
+  };
+  const VALID_TABS = Object.keys(TAB_SEGMENTS) as OwnerTab[];
+
+  function tabFromPath(pathname: string): OwnerTab {
+    let rest = pathname;
+    if (rest === ADMIN_BASE || rest.startsWith(`${ADMIN_BASE}/`)) {
+      rest = rest.slice(ADMIN_BASE.length);
+    }
+    const segment = rest.replace(/^\/+/, '').split('/')[0];
+    const match = VALID_TABS.find((tab) => TAB_SEGMENTS[tab] === segment);
+    return match ?? 'home';
+  }
+
+  $: cpBase = $page.url.pathname.startsWith(ADMIN_BASE) ? ADMIN_BASE : '';
+
+  function tabHref(tab: OwnerTab): string {
+    const segment = TAB_SEGMENTS[tab];
+    if (!segment) return cpBase || '/';
+    return `${cpBase}/${segment}`;
+  }
+
+  // activeTab is derived from the URL so deep links and the browser back/forward
+  // buttons just work; navigation happens by changing the URL (see setTab).
+  $: activeTab = tabFromPath($page.url.pathname);
 
   type ActivityEvent = {
     id: number;
@@ -111,14 +157,74 @@
   let birthdaysTotalPages = 1;
 
   let activeEmail = '';
+  let welcomeSubject = '';
   let serviceType = '';
   let priceDetails = '';
   let startDate = '';
   let sendError = '';
   let sending = false;
+
+  // Welcome-email send mode: deliver now, or queue for reliable later delivery.
+  let sendMode: 'now' | 'later' = 'now';
+  let scheduleAt = '';   // datetime-local value, e.g. "2026-06-20T14:30"
+  let welcomePreviewTimer: ReturnType<typeof setTimeout> | undefined;
+
+  // "Scheduled" tab: the durable queue of welcome emails awaiting/their history.
+  type ScheduledEmail = {
+    id: string;
+    kind: string;
+    email: string;
+    clientName: string;
+    dogName: string;
+    serviceType: string;
+    priceDetails: string;
+    startDate: string;
+    scheduledFor: string | null;
+    status: 'pending' | 'sent' | 'failed' | 'cancelled';
+    attempts: number;
+    createdAt: string | null;
+    sentAt: string | null;
+    lastError: string | null;
+  };
+  let scheduledPending: ScheduledEmail[] = [];
+  let scheduledHistory: ScheduledEmail[] = [];
+  let scheduledLoading = false;
+  let scheduledError = '';
+  let scheduledActionId = '';
+  let reschedulingId = '';
+  let rescheduleAt = '';
+  let editingEmail = '';
+  let profileSaving = false;
+  let profileError = '';
+  let profileEditorLabel = '';
+  let profileForm = {
+    originalEmail: '',
+    email: '',
+    fullName: '',
+    phone: '',
+    address: '',
+    dogName: '',
+  };
   let birthdayBusyEmail = '';
   let birthdayActionError = '';
 
+  // "Add client" modal — for leads from Instagram / Facebook / referrals that
+  // never came through the public enquiry form. Registers the email so they can
+  // access the onboarding form, and seeds a profile.
+  let addClientOpen = false;
+  let addClientSaving = false;
+  let addClientError = '';
+  let addClientForm = {
+    email: '',
+    fullName: '',
+    phone: '',
+    address: '',
+    dogName: '',
+    dogBreed: '',
+    source: '',
+    createInMyob: false,
+  };
+
   type Enquiry = {
     submittedAt: string;
     enquiryType: string;
@@ -149,13 +255,19 @@
   };
 
   let enquiry: Enquiry | null = null;
-  let enquiryJourney: SubmissionJourney | null = null;
   let enquiryLoading = false;
   let enquiryError = '';
   let enquiryOpen = false;
+  let enquiryClientLabel = '';
+
+  let journeyLoading = false;
+  let journeyError = '';
+  let journeyOpen = false;
+  let journeyClientLabel = '';
+  let journeyData: SubmissionJourney | null = null;
 
   type ConfirmContext =
-    | { kind: 'welcome'; client: PendingClient; serviceType: string; priceDetails: string; startDate: string }
+    | { kind: 'welcome'; client: PendingClient }
     | { kind: 'birthday'; client: BirthdayClient }
     | { kind: 'message'; recipientCount: number };
 
@@ -167,6 +279,45 @@
   let confirmPreviewBusy = false;
   let confirmPreviewToken = 0;
 
+  function normalizePreviewEmails(values: string[]): string[] {
+    const seen = new Set<string>();
+    const normalized: string[] = [];
+    for (const value of values) {
+      const email = value.trim().toLowerCase();
+      if (!email || seen.has(email)) continue;
+      seen.add(email);
+      normalized.push(email);
+    }
+    return normalized;
+  }
+
+  function applyPreviewEmails(values: string[]) {
+    previewEmails = normalizePreviewEmails(values);
+    const fallback = ownerEmail.trim().toLowerCase();
+    if (!previewEmails.length && fallback) previewEmails = [fallback];
+    if (!selectedPreviewEmails.size) {
+      selectedPreviewEmails = new Set(previewEmails);
+      return;
+    }
+    const next = new Set<string>();
+    for (const email of previewEmails) {
+      if (selectedPreviewEmails.has(email)) next.add(email);
+    }
+    if (!next.size) {
+      for (const email of previewEmails) next.add(email);
+    }
+    selectedPreviewEmails = next;
+  }
+
+  function togglePreviewRecipient(email: string) {
+    const next = new Set(selectedPreviewEmails);
+    if (next.has(email)) next.delete(email);
+    else next.add(email);
+    selectedPreviewEmails = next;
+  }
+
+  $: previewRecipientList = Array.from(selectedPreviewEmails).filter((email) => previewEmails.includes(email));
+
   async function fetchConfirmPreview(ctx: ConfirmContext) {
     const token = getToken();
     if (!token) return;
@@ -179,9 +330,9 @@
         url = '/api/owner/render-welcome-pack';
         body = {
           email: ctx.client.email,
-          serviceType: ctx.serviceType,
-          priceDetails: ctx.priceDetails,
-          startDate: ctx.startDate,
+          serviceType,
+          priceDetails,
+          startDate,
         };
       } else if (ctx.kind === 'birthday') {
         url = '/api/owner/render-birthday-email';
@@ -210,6 +361,15 @@
     }
   }
 
+  // The welcome dialog edits service/price/start inline, so refresh the live
+  // preview on a short debounce instead of on every keystroke.
+  function scheduleWelcomePreview() {
+    clearTimeout(welcomePreviewTimer);
+    welcomePreviewTimer = setTimeout(() => {
+      if (confirmCtx?.kind === 'welcome') void fetchConfirmPreview(confirmCtx);
+    }, 400);
+  }
+
   function openConfirmPreviewInNewTab() {
     if (!confirmPreviewHtml) return;
     const blob = new Blob([confirmPreviewHtml], { type: 'text/html' });
@@ -230,18 +390,59 @@
   let statusReason = '';
   let statusBusy = false;
   let statusError = '';
+  // Reset-onboarding lives in the same modal but is a separate action, so it
+  // gets its own busy flag and a two-step confirm to avoid accidental resets.
+  let onboardingResetBusy = false;
+  let onboardingResetConfirming = false;
 
   function openStatusEditor(client: AllClient) {
     statusCtx = client;
     statusDraft = client.lifecycle?.status ?? 'active';
     statusReason = client.lifecycle?.reason ?? '';
     statusError = '';
+    onboardingResetConfirming = false;
   }
 
   function closeStatusEditor() {
-    if (statusBusy) return;
+    if (statusBusy || onboardingResetBusy) return;
     statusCtx = null;
     statusError = '';
+    onboardingResetConfirming = false;
+  }
+
+  async function resetOnboarding() {
+    if (!statusCtx) return;
+    const token = getToken();
+    if (!token) {
+      statusError = 'Your session has expired. Please sign in again.';
+      return;
+    }
+    onboardingResetBusy = true;
+    statusError = '';
+    const targetEmail = statusCtx.email;
+    try {
+      const res = await fetch('/api/owner/reset-onboarding', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ email: targetEmail }),
+      });
+      const data = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not reset onboarding.');
+
+      const updated = data?.client as AllClient | undefined;
+      if (updated) {
+        allClients = allClients.map((c) => (c.email === targetEmail ? { ...c, ...updated } : c));
+      }
+      onboardingResetConfirming = false;
+      statusCtx = null;
+      // They drop back into the pending list, so refresh both views.
+      void fetchHome();
+      void fetchAllClients(allClientsPage);
+    } catch (error) {
+      statusError = error instanceof Error ? error.message : 'Could not reset onboarding.';
+    } finally {
+      onboardingResetBusy = false;
+    }
   }
 
   async function saveStatus() {
@@ -269,6 +470,9 @@
         );
       }
       statusCtx = null;
+      // Cancelled/archived clients drop off the home dashboard (and reactivated
+      // ones reappear). The server applies that filter, so refresh the list.
+      void fetchHome();
     } catch (error) {
       statusError = error instanceof Error ? error.message : 'Could not update status.';
     } finally {
@@ -282,11 +486,31 @@
 
   function resetComposer() {
     activeEmail = '';
+    welcomeSubject = '';
     serviceType = '';
     priceDetails = '';
     startDate = '';
+    welcomePreviewDraft = false;
     sendError = '';
     sending = false;
+    sendMode = 'now';
+    scheduleAt = '';
+    clearTimeout(welcomePreviewTimer);
+  }
+
+  function resetProfileEditor() {
+    editingEmail = '';
+    profileSaving = false;
+    profileError = '';
+    profileEditorLabel = '';
+    profileForm = {
+      originalEmail: '',
+      email: '',
+      fullName: '',
+      phone: '',
+      address: '',
+      dogName: '',
+    };
   }
 
   function formatDateLabel(value: string): string {
@@ -319,7 +543,7 @@
     const params = evt.params && typeof evt.params === 'object' ? evt.params : null;
     const paramLabel = params && typeof params.label === 'string' ? params.label : '';
     const detail = label || paramLabel;
-    return detail ? `${name} — ${detail}` : name;
+    return detail ? `${name}: ${detail}` : name;
   }
 
   function mergedJourneyEvents(journey: SubmissionJourney | null): JourneyEvent[] {
@@ -361,12 +585,217 @@
     return `In ${daysUntil} days`;
   }
 
+  // Opening the composer now goes straight to the combined dialog — the fields,
+  // live preview, and send-now/schedule controls all live there.
   function openComposer(client: PendingClient) {
     activeEmail = client.email;
+    welcomeSubject = client.dogName ? `Goodwalk Onboarding - ${client.dogName}` : 'Goodwalk Onboarding';
     serviceType = client.welcomePackOffer?.serviceType || client.services?.[0] || '';
     priceDetails = client.welcomePackOffer?.priceDetails || '';
     startDate = client.welcomePackOffer?.startDate || '';
+    welcomePreviewDraft = false;
+    sendMode = 'now';
+    scheduleAt = '';
     sendError = '';
+    confirmError = '';
+    confirmPreview = false;
+    confirmCtx = { kind: 'welcome', client };
+  }
+
+  function openProfileEditor(client: { email: string; fullName: string; phone: string; address?: string; dogName: string }) {
+    editingEmail = client.email;
+    profileSaving = false;
+    profileError = '';
+    profileEditorLabel = client.fullName || client.email;
+    profileForm = {
+      originalEmail: client.email,
+      email: client.email,
+      fullName: client.fullName || '',
+      phone: client.phone || '',
+      address: client.address || '',
+      dogName: client.dogName || '',
+    };
+  }
+
+  function applyUpdatedClientLocally(
+    originalEmail: string,
+    updated: { email: string; fullName: string; phone: string; address: string; dogName: string }
+  ) {
+    pendingClients = pendingClients.map((client) =>
+      client.email === originalEmail
+        ? {
+            ...client,
+            email: updated.email,
+            fullName: updated.fullName,
+            phone: updated.phone,
+            address: updated.address,
+            dogName: updated.dogName,
+          }
+        : client
+    );
+
+    allClients = allClients.map((client) =>
+      client.email === originalEmail
+        ? {
+            ...client,
+            email: updated.email,
+            fullName: updated.fullName,
+            phone: updated.phone,
+            address: updated.address,
+            dogName: updated.dogName,
+          }
+        : client
+    );
+
+    birthdayClients = birthdayClients.map((client) =>
+      client.email === originalEmail
+        ? {
+            ...client,
+            email: updated.email,
+            fullName: updated.fullName,
+            dogName: updated.dogName,
+          }
+        : client
+    );
+  }
+
+  async function saveProfileEdits() {
+    const token = getToken();
+    if (!token || !profileForm.originalEmail) return;
+
+    const nextEmail = profileForm.email.trim().toLowerCase();
+    const fullName = profileForm.fullName.trim();
+    const dogName = profileForm.dogName.trim();
+    if (!fullName) {
+      profileError = 'Please enter the owner name.';
+      return;
+    }
+    if (!nextEmail) {
+      profileError = 'Please enter the owner email.';
+      return;
+    }
+    if (!dogName) {
+      profileError = 'Please enter the dog name.';
+      return;
+    }
+
+    profileSaving = true;
+    profileError = '';
+    const originalEmail = profileForm.originalEmail;
+    const refreshBirthdays = birthdayClients.some((client) => client.email === originalEmail);
+
+    try {
+      const res = await fetch('/api/owner/client-profile', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify({
+          email: originalEmail,
+          nextEmail,
+          fullName,
+          phone: profileForm.phone.trim(),
+          address: profileForm.address.trim(),
+          dogName,
+        }),
+      });
+      const data = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not update client details.');
+
+      const updatedClient = {
+        email: typeof data?.client?.email === 'string' ? data.client.email : nextEmail,
+        fullName: typeof data?.client?.fullName === 'string' ? data.client.fullName : fullName,
+        phone: typeof data?.client?.phone === 'string' ? data.client.phone : profileForm.phone.trim(),
+        address: typeof data?.client?.address === 'string' ? data.client.address : profileForm.address.trim(),
+        dogName: typeof data?.client?.dogName === 'string' ? data.client.dogName : dogName,
+      };
+
+      applyUpdatedClientLocally(originalEmail, updatedClient);
+
+      if (activeEmail === originalEmail) activeEmail = updatedClient.email;
+      if (refreshBirthdays) {
+        await fetchBirthdays(birthdaysPage);
+      }
+
+      resetProfileEditor();
+    } catch (error) {
+      profileError = error instanceof Error ? error.message : 'Could not update client details.';
+    } finally {
+      profileSaving = false;
+    }
+  }
+
+  function openAddClient() {
+    addClientForm = { email: '', fullName: '', phone: '', address: '', dogName: '', dogBreed: '', source: '', createInMyob: false };
+    addClientError = '';
+    addClientSaving = false;
+    addClientOpen = true;
+  }
+
+  function closeAddClient() {
+    if (addClientSaving) return;
+    addClientOpen = false;
+    addClientError = '';
+  }
+
+  async function saveNewClient() {
+    const token = getToken();
+    if (!token) {
+      addClientError = 'Your session has expired. Please sign in again.';
+      return;
+    }
+
+    const email = addClientForm.email.trim().toLowerCase();
+    const fullName = addClientForm.fullName.trim();
+    if (!fullName) {
+      addClientError = 'Please enter the owner name.';
+      return;
+    }
+    if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+      addClientError = 'Please enter a valid email address.';
+      return;
+    }
+
+    addClientSaving = true;
+    addClientError = '';
+    try {
+      const res = await fetch('/api/owner/add-client', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({
+          email,
+          fullName,
+          phone: addClientForm.phone.trim(),
+          address: addClientForm.address.trim(),
+          dogName: addClientForm.dogName.trim(),
+          dogBreed: addClientForm.dogBreed.trim(),
+          source: addClientForm.source.trim(),
+          createInMyob: addClientForm.createInMyob,
+        }),
+      });
+      const data = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not add the client.');
+
+      // The client is always created locally. If MYOB sync was requested but
+      // failed, keep the modal open and tell the owner — the client is still
+      // saved, so they can close it or retry the MYOB step later.
+      const myob = data?.myob;
+      if (addClientForm.createInMyob && myob && !myob.ok) {
+        addClientError = `Client added, but MYOB sync failed: ${myob.message ?? 'unknown error'}`;
+        await Promise.all([fetchHome(), fetchAllClients(1)]);
+        return;
+      }
+
+      addClientOpen = false;
+      // Refresh the lists so the new client appears immediately wherever they belong.
+      await Promise.all([fetchHome(), fetchAllClients(1)]);
+      setTab('clients');
+    } catch (error) {
+      addClientError = error instanceof Error ? error.message : 'Could not add the client.';
+    } finally {
+      addClientSaving = false;
+    }
   }
 
   async function fetchHome() {
@@ -462,9 +891,12 @@
           isAuthenticated = true;
           userEmail = data.email;
           ownerEmail = typeof data.ownerEmail === 'string' && data.ownerEmail ? data.ownerEmail : ownerEmail;
+          applyPreviewEmails(Array.isArray(data.previewEmails) ? data.previewEmails : []);
           accessDenied = !data.cpAdmin;
           if (!accessDenied) {
             await Promise.all([fetchHome(), fetchAllClients(1), fetchBirthdays(1)]);
+            // Deep link straight into a lazy tab (e.g. /scheduled) — load it now.
+            loadActiveTabData();
           }
         } else {
           window.localStorage.removeItem('gw_onboarding_session');
@@ -476,13 +908,15 @@
     authChecking = false;
   }
 
-  function handleAuthenticated(event: CustomEvent<{ email: string; cpAdmin?: boolean; ownerEmail?: string }>) {
+  function handleAuthenticated(event: CustomEvent<{ email: string; cpAdmin?: boolean; ownerEmail?: string; previewEmails?: string[] }>) {
     isAuthenticated = true;
     userEmail = event.detail.email;
     ownerEmail = event.detail.ownerEmail || ownerEmail;
+    applyPreviewEmails(event.detail.previewEmails ?? []);
     accessDenied = !event.detail.cpAdmin;
     if (!accessDenied) {
       void Promise.all([fetchHome(), fetchAllClients(1), fetchBirthdays(1)]);
+      loadActiveTabData();
     }
   }
 
@@ -493,32 +927,10 @@
     pendingClients = [];
     allClients = [];
     birthdayClients = [];
+    previewEmails = [];
+    selectedPreviewEmails = new Set();
     resetComposer();
-  }
-
-  function requestSendWelcome(client: PendingClient) {
-    if (!serviceType.trim()) {
-      sendError = 'Please enter the service.';
-      return;
-    }
-    if (!priceDetails.trim()) {
-      sendError = 'Please enter the price details.';
-      return;
-    }
-    if (!startDate.trim()) {
-      sendError = 'Please enter a start date.';
-      return;
-    }
-    sendError = '';
-    confirmCtx = {
-      kind: 'welcome',
-      client,
-      serviceType: serviceType.trim(),
-      priceDetails: priceDetails.trim(),
-      startDate: startDate.trim(),
-    };
-    confirmPreview = false;
-    confirmError = '';
+    resetProfileEditor();
   }
 
   function requestSendBirthday(client: BirthdayClient) {
@@ -529,9 +941,11 @@
 
   function closeConfirm() {
     if (confirmBusy) return;
+    const wasWelcome = confirmCtx?.kind === 'welcome';
     confirmCtx = null;
     confirmPreview = false;
     confirmError = '';
+    if (wasWelcome) resetComposer();
   }
 
   async function performConfirm() {
@@ -545,7 +959,24 @@
     confirmError = '';
     try {
       if (confirmCtx.kind === 'welcome') {
-        const { client, serviceType: st, priceDetails: pd, startDate: sd } = confirmCtx;
+        const { client } = confirmCtx;
+        const st = serviceType.trim();
+        const pd = priceDetails.trim();
+        const sd = startDate.trim();
+        if (!st) { confirmError = 'Please enter the service.'; confirmBusy = false; return; }
+        if (!pd) { confirmError = 'Please enter the price details.'; confirmBusy = false; return; }
+        if (!sd) { confirmError = 'Please enter a start date.'; confirmBusy = false; return; }
+
+        const scheduling = sendMode === 'later' && !confirmPreview;
+        if (scheduling) {
+          if (!scheduleAt) { confirmError = 'Please choose when to send the email.'; confirmBusy = false; return; }
+          if (new Date(scheduleAt).getTime() <= Date.now()) {
+            confirmError = 'Please choose a time in the future.';
+            confirmBusy = false;
+            return;
+          }
+        }
+
         const res = await fetch('/api/owner/send-welcome-pack', {
           method: 'POST',
           headers: {
@@ -554,15 +985,27 @@
           },
           body: JSON.stringify({
             email: client.email,
+            subject: welcomeSubject.trim(),
             serviceType: st,
             priceDetails: pd,
             startDate: sd,
             preview: confirmPreview,
+            previewRecipients: confirmPreview ? previewRecipientList : [],
+            scheduledFor: scheduling ? scheduleAt : null,
           }),
         });
         const data = await res.json().catch(() => null);
         if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not send welcome email.');
 
+        if (data?.scheduled) {
+          // Queued for later — surface it in the Scheduled tab.
+          confirmCtx = null;
+          resetComposer();
+          await fetchScheduled();
+          setTab('scheduled');
+          return;
+        }
+
         if (!confirmPreview) {
           pendingClients = pendingClients.map((item) =>
             item.email === client.email
@@ -597,6 +1040,7 @@
             fontId: selectedFontId,
             recipients: confirmPreview ? [] : resolvedRecipients,
             preview: confirmPreview,
+            previewRecipients: confirmPreview ? previewRecipientList : [],
           }),
         });
         const data = await res.json().catch(() => null);
@@ -610,7 +1054,11 @@
             'Content-Type': 'application/json',
             Authorization: `Bearer ${token}`,
           },
-          body: JSON.stringify({ email: client.email, preview: confirmPreview }),
+          body: JSON.stringify({
+            email: client.email,
+            preview: confirmPreview,
+            previewRecipients: confirmPreview ? previewRecipientList : [],
+          }),
         });
         const data = await res.json().catch(() => null);
         if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not send birthday email.');
@@ -637,11 +1085,11 @@
   }
 
   async function openEnquiry(email: string) {
+    enquiryClientLabel = email;
     enquiryOpen = true;
     enquiryLoading = true;
     enquiryError = '';
     enquiry = null;
-    enquiryJourney = null;
     const token = getToken();
     if (!token) {
       enquiryError = 'Your session has expired. Please sign in again.';
@@ -655,7 +1103,7 @@
       const data = await res.json().catch(() => null);
       if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not load enquiry.');
       enquiry = data?.enquiry ?? null;
-      enquiryJourney = data?.journey ?? null;
+      enquiryClientLabel = data?.enquiry?.fullName || email;
     } catch (error) {
       enquiryError = error instanceof Error ? error.message : 'Could not load enquiry.';
     } finally {
@@ -666,8 +1114,161 @@
   function closeEnquiry() {
     enquiryOpen = false;
     enquiry = null;
-    enquiryJourney = null;
     enquiryError = '';
+    enquiryClientLabel = '';
+  }
+
+  async function openJourney(client: { email: string; fullName?: string }) {
+    journeyClientLabel = client.fullName || client.email;
+    journeyOpen = true;
+    journeyLoading = true;
+    journeyError = '';
+    journeyData = null;
+    const token = getToken();
+    if (!token) {
+      journeyError = 'Your session has expired. Please sign in again.';
+      journeyLoading = false;
+      return;
+    }
+    try {
+      const res = await fetch(`/api/owner/client-enquiry?email=${encodeURIComponent(client.email)}`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      const data = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not load journey.');
+      journeyData = data?.journey ?? null;
+      if (!journeyClientLabel) journeyClientLabel = data?.enquiry?.fullName || client.email;
+    } catch (error) {
+      journeyError = error instanceof Error ? error.message : 'Could not load journey.';
+    } finally {
+      journeyLoading = false;
+    }
+  }
+
+  function closeJourney() {
+    journeyOpen = false;
+    journeyLoading = false;
+    journeyError = '';
+    journeyClientLabel = '';
+    journeyData = null;
+  }
+
+  // ── View as client (impersonation preview) ────────────────────────────────
+  // The owner can step through a client's onboarding exactly as the client
+  // would. It never touches the real client: the snapshot endpoint is read-only
+  // and the final submit is routed to the owner preview endpoint. By default a
+  // run-through is a dry run (nothing sent); the owner can opt in — via the
+  // setup modal below — to email the completed result to a chosen address.
+  type ViewAsClient = { email: string; fullName?: string; dogName?: string };
+
+  let viewAsOpen = false;
+  let viewAsLoading = false;
+  let viewAsError = '';
+  let viewAsLoadingEmail = '';
+  let viewAsLabel = '';
+  let viewAsData: { email?: string; profile?: Record<string, unknown>; draft?: Record<string, unknown> } | null = null;
+
+  // Setup modal (shown before entering the preview).
+  let viewAsSetupOpen = false;
+  let viewAsSetupClient: ViewAsClient | null = null;
+  let viewAsPreviewSend = false;
+  let viewAsPreviewEmail = '';
+  let viewAsSetupError = '';
+
+  // Step 1: clicking "View as client" opens the setup modal.
+  function openClientView(client: ViewAsClient) {
+    viewAsSetupClient = client;
+    viewAsPreviewSend = false;
+    viewAsPreviewEmail = userEmail || ownerEmail || '';
+    viewAsSetupError = '';
+    viewAsSetupOpen = true;
+  }
+
+  function closeViewAsSetup() {
+    viewAsSetupOpen = false;
+    viewAsSetupClient = null;
+    viewAsSetupError = '';
+  }
+
+  // Step 2: confirm settings, then load the snapshot and open the run-through.
+  function confirmClientView() {
+    if (!viewAsSetupClient) return;
+    if (viewAsPreviewSend) {
+      const email = viewAsPreviewEmail.trim();
+      if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+        viewAsSetupError = 'Enter a valid email address for the preview.';
+        return;
+      }
+      viewAsPreviewEmail = email;
+    }
+    const client = viewAsSetupClient;
+    viewAsSetupOpen = false;
+    void startClientView(client);
+  }
+
+  async function startClientView(client: ViewAsClient) {
+    viewAsLoadingEmail = client.email;
+    viewAsError = '';
+    const token = getToken();
+    if (!token) {
+      viewAsLoadingEmail = '';
+      viewAsError = 'Your session has expired. Please sign in again.';
+      viewAsLabel = client.fullName || client.email;
+      viewAsData = null;
+      viewAsOpen = true;
+      return;
+    }
+    viewAsLoading = true;
+    try {
+      const res = await fetch(`/api/owner/client-onboarding-view?email=${encodeURIComponent(client.email)}`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      const data = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Could not load client view.');
+      viewAsData = { email: data?.email ?? client.email, profile: data?.profile ?? {}, draft: data?.draft ?? {} };
+      viewAsLabel = client.fullName || client.email;
+      viewAsOpen = true;
+    } catch (error) {
+      viewAsError = error instanceof Error ? error.message : 'Could not load client view.';
+      viewAsOpen = true;
+    } finally {
+      viewAsLoading = false;
+      viewAsLoadingEmail = '';
+    }
+  }
+
+  // Final submit of the run-through. Dry run sends nothing; otherwise the result
+  // is emailed only to the chosen preview address. Never reaches the client.
+  async function impersonationSubmit(payload: Record<string, unknown>) {
+    if (!viewAsPreviewSend) return;
+    const token = getToken();
+    if (!token) throw new Error('Your session has expired. Please sign in again.');
+    const res = await fetch(`/api/owner/onboarding-preview-submit?to=${encodeURIComponent(viewAsPreviewEmail)}`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+      body: JSON.stringify(payload),
+    });
+    const data = await res.json().catch(() => null);
+    if (!res.ok) throw new Error(data?.detail?.message ?? data?.detail ?? 'Preview send failed.');
+  }
+
+  function closeClientView() {
+    viewAsOpen = false;
+    viewAsData = null;
+    viewAsError = '';
+    viewAsLabel = '';
+  }
+
+  // Per-row "more actions" (⋯) menu. Only one row's menu is open at a time,
+  // tracked by email. Closed on outside click / Escape (see svelte:window).
+  let openMenuEmail = '';
+
+  function toggleRowMenu(email: string) {
+    openMenuEmail = openMenuEmail === email ? '' : email;
+  }
+
+  function closeRowMenu() {
+    openMenuEmail = '';
   }
 
   async function toggleBirthdayAutoSend(email: string, enabled: boolean) {
@@ -697,15 +1298,108 @@
     }
   }
 
-  function setTab(tab: 'home' | 'clients' | 'birthdays' | 'messaging' | 'activity') {
-    activeTab = tab;
+  // Navigation is URL-driven: change the path and let the reactive activeTab
+  // (and the side-effects block below) follow. Same signature as before so all
+  // the existing call sites keep working.
+  function setTab(tab: OwnerTab) {
+    void goto(tabHref(tab));
+  }
+
+  // Lazy-load the data a tab needs the first time it becomes active (or when a
+  // deep link lands on it after auth completes).
+  function loadActiveTabData() {
+    if (!isAuthenticated || accessDenied) return;
+    if (activeTab === 'messaging') {
+      if (!messageTemplates.length) void fetchMessageTemplates();
+    } else if (activeTab === 'scheduled') {
+      void fetchScheduled();
+    } else if (activeTab === 'activity') {
+      void fetchActivity();
+    }
+  }
+
+  // React to the URL-derived tab changing (clicks, deep links, back/forward).
+  let appliedTab: OwnerTab | null = null;
+  $: if (activeTab !== appliedTab) {
+    appliedTab = activeTab;
     resetComposer();
     birthdayActionError = '';
-    if (tab === 'messaging' && !messageTemplates.length) {
-      void fetchMessageTemplates();
+    loadActiveTabData();
+  }
+
+  async function fetchScheduled() {
+    const token = getToken();
+    if (!token) return;
+    scheduledLoading = true;
+    scheduledError = '';
+    try {
+      const res = await fetch('/api/owner/scheduled-emails', {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      const json = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(json?.detail?.message ?? json?.detail ?? `Could not load scheduled emails (${res.status}).`);
+      scheduledPending = Array.isArray(json?.pending) ? json.pending : [];
+      scheduledHistory = Array.isArray(json?.history) ? json.history : [];
+    } catch (error) {
+      scheduledError = error instanceof Error ? error.message : 'Could not load scheduled emails.';
+    } finally {
+      scheduledLoading = false;
     }
-    if (tab === 'activity') {
-      void fetchActivity();
+  }
+
+  async function cancelScheduled(id: string) {
+    const token = getToken();
+    if (!token) return;
+    scheduledActionId = id;
+    scheduledError = '';
+    try {
+      const res = await fetch('/api/owner/scheduled-emails/cancel', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ id }),
+      });
+      const json = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(json?.detail?.message ?? json?.detail ?? 'Could not cancel the scheduled email.');
+      await fetchScheduled();
+    } catch (error) {
+      scheduledError = error instanceof Error ? error.message : 'Could not cancel the scheduled email.';
+    } finally {
+      scheduledActionId = '';
+    }
+  }
+
+  function startReschedule(item: ScheduledEmail) {
+    reschedulingId = item.id;
+    rescheduleAt = item.scheduledFor ?? '';
+    scheduledError = '';
+  }
+
+  function cancelReschedule() {
+    reschedulingId = '';
+    rescheduleAt = '';
+  }
+
+  async function saveReschedule(id: string) {
+    const token = getToken();
+    if (!token) return;
+    if (!rescheduleAt) { scheduledError = 'Please choose a new time.'; return; }
+    if (new Date(rescheduleAt).getTime() <= Date.now()) { scheduledError = 'Please choose a time in the future.'; return; }
+    scheduledActionId = id;
+    scheduledError = '';
+    try {
+      const res = await fetch('/api/owner/scheduled-emails/reschedule', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+        body: JSON.stringify({ id, scheduledFor: rescheduleAt }),
+      });
+      const json = await res.json().catch(() => null);
+      if (!res.ok) throw new Error(json?.detail?.message ?? json?.detail ?? 'Could not reschedule the email.');
+      cancelReschedule();
+      await fetchScheduled();
+    } catch (error) {
+      scheduledError = error instanceof Error ? error.message : 'Could not reschedule the email.';
+    } finally {
+      scheduledActionId = '';
     }
   }
 
@@ -992,7 +1686,7 @@
       description: 'Clients who have enquired but have not yet finished onboarding.',
     },
     clients: {
-      title: 'All Clients',
+      title: 'Clients',
       description: 'Everyone currently on file, with their onboarding status.',
     },
     birthdays: {
@@ -1003,6 +1697,10 @@
       title: 'Messaging',
       description: 'Send themed bulk or individual emails to clients via BCC.',
     },
+    scheduled: {
+      title: 'Scheduled',
+      description: 'Welcome emails queued to send automatically at a later time.',
+    },
     activity: {
       title: 'Activity',
       description: 'Audit log of contact-form submissions, logins, and owner actions.',
@@ -1054,7 +1752,7 @@
           </button>
           <button type="button" class:owner-topbar-tab-active={activeTab === 'clients'} class="owner-topbar-tab" on:click={() => setTab('clients')}>
             <Icon name="fas fa-users" />
-            <span>All Clients</span>
+            <span>Clients</span>
           </button>
           <button type="button" class:owner-topbar-tab-active={activeTab === 'birthdays'} class="owner-topbar-tab" on:click={() => setTab('birthdays')}>
             <Icon name="fas fa-cake-candles" />
@@ -1064,6 +1762,10 @@
             <Icon name="fas fa-envelope-open-text" />
             <span>Messaging</span>
           </button>
+          <button type="button" class:owner-topbar-tab-active={activeTab === 'scheduled'} class="owner-topbar-tab" on:click={() => setTab('scheduled')}>
+            <Icon name="fas fa-clock" />
+            <span>Scheduled</span>
+          </button>
           <button type="button" class:owner-topbar-tab-active={activeTab === 'activity'} class="owner-topbar-tab" on:click={() => setTab('activity')}>
             <Icon name="fas fa-clock-rotate-left" />
             <span>Activity</span>
@@ -1123,6 +1825,26 @@
           {/if}
 
           {#if activeTab === 'home'}
+            <div class="owner-section-head">
+              <div class="owner-section-copy">
+                <h2>Recent clients</h2>
+                <p>Latest enquiries waiting on onboarding or a welcome follow-up.</p>
+              </div>
+              <div class="owner-section-actions">
+                <button type="button" class="owner-page-btn owner-send-btn owner-section-link" on:click={openAddClient}>
+                  <Icon name="fas fa-user-plus" />
+                  Add client
+                </button>
+                <button
+                  type="button"
+                  class="owner-page-btn owner-section-link"
+                  on:click={() => setTab('clients')}
+                >
+                  View all clients
+                </button>
+              </div>
+            </div>
+
             {#if homeError}
               <div class="owner-message-card owner-message-card-error">
                 <h2>Could not load home.</h2>
@@ -1147,12 +1869,20 @@
                 </div>
 
                 {#each pendingClients as client}
-                  <article class="owner-table owner-table-row owner-table-home">
+                  <article class="owner-table owner-table-row owner-table-home owner-row-interactive" class:owner-row-menu-open={openMenuEmail === client.email}>
                     <div class="owner-cell">
                       <span class="owner-mobile-label">Client</span>
-                      <div>
+                      <div class="owner-primary-stack">
                         <h3>{client.fullName || client.email}</h3>
                         <p>{client.dogName || 'No dog name saved'}{#if client.dogBreed} · {client.dogBreed}{/if}</p>
+                        <div class="owner-glance-row">
+                          <span class:owner-glance-chip-quiet={Boolean(client.welcomePackSentAt)} class="owner-glance-chip">
+                            {client.welcomePackSentAt ? 'Welcome sent' : 'Needs welcome'}
+                          </span>
+                          {#if client.lastEnquiryAt}
+                            <span class="owner-glance-chip owner-glance-chip-quiet">Enquired {formatDateLabel(client.lastEnquiryAt)}</span>
+                          {/if}
+                        </div>
                       </div>
                     </div>
 
@@ -1178,55 +1908,70 @@
 
                     <div class="owner-cell owner-action-cell">
                       <span class="owner-mobile-label">Action</span>
-                      <div class="owner-action-row">
+                      <div class="owner-action-buttons">
                         <button class="owner-open-btn" type="button" on:click={() => openComposer(client)}>
                           <Icon name="fas fa-paper-plane" />
                           {client.welcomePackSentAt ? 'Resend' : 'Send'}
                         </button>
-                        <button class="owner-secondary-btn" type="button" on:click={() => openEnquiry(client.email)}>
-                          <Icon name="fas fa-file-lines" />
-                          View enquiry
+                        <button class="owner-secondary-btn" type="button" on:click={() => openProfileEditor(client)}>
+                          <Icon name="fas fa-pen" />
+                          Edit details
                         </button>
-                      </div>
-                    </div>
-
-                    {#if activeEmail === client.email}
-                      <div class="owner-compose-card">
-                        <label class="owner-field">
-                          <span>Service</span>
-                          <input bind:value={serviceType} placeholder="Tiny Gang Pack Walks" />
-                        </label>
-
-                        <label class="owner-field">
-                          <span>Price Details</span>
-                          <input bind:value={priceDetails} placeholder="$45 per walk, invoiced weekly" />
-                        </label>
-
-                        <label class="owner-field">
-                          <span>Start Date</span>
-                          <input bind:value={startDate} type="date" />
-                        </label>
-
-                        {#if sendError}
-                          <div class="owner-inline-error">{sendError}</div>
-                        {/if}
-
-                        <div class="owner-compose-actions">
-                          <button class="owner-cancel-btn" type="button" on:click={resetComposer}>Cancel</button>
-                          <button class="owner-send-btn" type="button" on:click={() => requestSendWelcome(client)}>
-                            Send email
+                        <div class="owner-menu-wrap">
+                          <button
+                            class="owner-menu-trigger"
+                            class:owner-menu-trigger-active={openMenuEmail === client.email}
+                            type="button"
+                            aria-haspopup="menu"
+                            aria-expanded={openMenuEmail === client.email}
+                            aria-label="More actions"
+                            on:click|stopPropagation={() => toggleRowMenu(client.email)}
+                          >
+                            <Icon name="fas fa-ellipsis" />
                           </button>
+                          {#if openMenuEmail === client.email}
+                            <div class="owner-menu" role="menu">
+                              <button
+                                class="owner-menu-item"
+                                type="button"
+                                role="menuitem"
+                                disabled={viewAsLoadingEmail === client.email}
+                                on:click={() => { closeRowMenu(); openClientView(client); }}
+                              >
+                                <Icon name={viewAsLoadingEmail === client.email ? 'fas fa-circle-notch' : 'fas fa-eye'} className={viewAsLoadingEmail === client.email ? 'auth-spinner' : ''} />
+                                View as client
+                              </button>
+                              <button class="owner-menu-item" type="button" role="menuitem" on:click={() => { closeRowMenu(); openEnquiry(client.email); }}>
+                                <Icon name="fas fa-file-lines" />
+                                View enquiry
+                              </button>
+                              <button class="owner-menu-item" type="button" role="menuitem" on:click={() => { closeRowMenu(); openJourney(client); }}>
+                                <Icon name="fas fa-route" />
+                                View journey
+                              </button>
+                            </div>
+                          {/if}
                         </div>
                       </div>
-                    {/if}
+                    </div>
                   </article>
                 {/each}
               </div>
             {/if}
-          {:else if activeTab === 'clients'}
-            <div class="owner-section-head owner-section-head-meta">
-              <div class="owner-pagination-summary">
-                Page {allClientsPage} of {allClientsTotalPages}
+            {:else if activeTab === 'clients'}
+            <div class="owner-section-head">
+              <div class="owner-section-copy">
+                <h2>All clients</h2>
+                <p>{allClientsTotal} client{allClientsTotal === 1 ? '' : 's'} on file.</p>
+              </div>
+              <div class="owner-section-actions">
+                <button type="button" class="owner-page-btn owner-send-btn owner-section-link" on:click={openAddClient}>
+                  <Icon name="fas fa-user-plus" />
+                  Add client
+                </button>
+                <div class="owner-pagination-summary">
+                  Page {allClientsPage} of {allClientsTotalPages}
+                </div>
               </div>
             </div>
 
@@ -1253,16 +1998,24 @@
                 </div>
 
                 {#each allClients as client}
-                  <article class="owner-table owner-table-row owner-table-clients">
+                  <article class="owner-table owner-table-row owner-table-clients owner-row-interactive" class:owner-row-menu-open={openMenuEmail === client.email}>
                     <div class="owner-cell">
                       <span class="owner-mobile-label">Client</span>
-                      <div>
+                      <div class="owner-primary-stack">
                         <h3>{client.fullName || client.email}</h3>
                         <p>{client.dogName || 'No dog name saved'}{#if client.dogBreed} · {client.dogBreed}{/if}</p>
                         <div class="owner-contact-row">
                           <a href={`mailto:${client.email}`}>{client.email}</a>
                           {#if client.phone}<small>{client.phone}</small>{/if}
                         </div>
+                        <div class="owner-glance-row">
+                          <span class="owner-glance-chip owner-glance-chip-quiet">
+                            {formatDateLabel(client.lastActivityAt) || 'No recent activity'}
+                          </span>
+                          {#if client.status === 'completed'}
+                            <span class="owner-glance-chip">Onboarding complete</span>
+                          {/if}
+                        </div>
                       </div>
                     </div>
 
@@ -1288,16 +2041,53 @@
                       </div>
                     </div>
 
-                    <div class="owner-cell owner-action-cell owner-action-stack">
+                    <div class="owner-cell owner-action-cell">
                       <span class="owner-mobile-label">Action</span>
-                      <button class="owner-secondary-btn" type="button" on:click={() => openEnquiry(client.email)}>
-                        <Icon name="fas fa-file-lines" />
-                        View enquiry
-                      </button>
-                      <button class="owner-secondary-btn" type="button" on:click={() => openStatusEditor(client)}>
-                        <Icon name="fas fa-circle-half-stroke" />
-                        Change status
-                      </button>
+                      <div class="owner-action-buttons">
+                        <button class="owner-secondary-btn" type="button" on:click={() => openProfileEditor(client)}>
+                          <Icon name="fas fa-pen" />
+                          Edit details
+                        </button>
+                        <button class="owner-secondary-btn" type="button" on:click={() => openStatusEditor(client)}>
+                          <Icon name="fas fa-circle-half-stroke" />
+                          Change status
+                        </button>
+                        <div class="owner-menu-wrap">
+                          <button
+                            class="owner-menu-trigger"
+                            class:owner-menu-trigger-active={openMenuEmail === client.email}
+                            type="button"
+                            aria-haspopup="menu"
+                            aria-expanded={openMenuEmail === client.email}
+                            aria-label="More actions"
+                            on:click|stopPropagation={() => toggleRowMenu(client.email)}
+                          >
+                            <Icon name="fas fa-ellipsis" />
+                          </button>
+                          {#if openMenuEmail === client.email}
+                            <div class="owner-menu" role="menu">
+                              <button
+                                class="owner-menu-item"
+                                type="button"
+                                role="menuitem"
+                                disabled={viewAsLoadingEmail === client.email}
+                                on:click={() => { closeRowMenu(); openClientView(client); }}
+                              >
+                                <Icon name={viewAsLoadingEmail === client.email ? 'fas fa-circle-notch' : 'fas fa-eye'} className={viewAsLoadingEmail === client.email ? 'auth-spinner' : ''} />
+                                View as client
+                              </button>
+                              <button class="owner-menu-item" type="button" role="menuitem" on:click={() => { closeRowMenu(); openEnquiry(client.email); }}>
+                                <Icon name="fas fa-file-lines" />
+                                View enquiry
+                              </button>
+                              <button class="owner-menu-item" type="button" role="menuitem" on:click={() => { closeRowMenu(); openJourney(client); }}>
+                                <Icon name="fas fa-route" />
+                                View journey
+                              </button>
+                            </div>
+                          {/if}
+                        </div>
+                      </div>
                     </div>
                   </article>
                 {/each}
@@ -1348,12 +2138,18 @@
                 </div>
 
                 {#each birthdayClients as client}
-                  <article class="owner-table owner-table-row owner-table-birthdays">
+                  <article class="owner-table owner-table-row owner-table-birthdays owner-row-interactive">
                     <div class="owner-cell">
                       <span class="owner-mobile-label">Dog</span>
-                      <div>
+                      <div class="owner-primary-stack">
                         <h3>{client.dogName || 'Unknown dog'}</h3>
                         <p>{client.fullName || client.email}{#if client.dogBreed} · {client.dogBreed}{/if}</p>
+                        <div class="owner-glance-row">
+                          <span class="owner-glance-chip">{birthdayRelativeLabel(client.daysUntil)}</span>
+                          {#if client.birthdayEmailLastSentAt}
+                            <span class="owner-glance-chip owner-glance-chip-quiet">Sent {formatDateLabel(client.birthdayEmailLastSentAt)}</span>
+                          {/if}
+                        </div>
                       </div>
                     </div>
 
@@ -1616,6 +2412,99 @@
                 </aside>
               </div>
             {/if}
+          {:else if activeTab === 'scheduled'}
+            <div class="owner-section-head">
+              <div class="owner-section-copy">
+                <h2>Scheduled emails</h2>
+                <p>Welcome emails queued to send automatically at a later time.</p>
+              </div>
+              <button type="button" class="activity-refresh" on:click={() => void fetchScheduled()} disabled={scheduledLoading}>
+                <Icon name="fas fa-arrows-rotate" />
+                {scheduledLoading ? 'Refreshing…' : 'Refresh'}
+              </button>
+            </div>
+
+            {#if scheduledError}
+              <div class="owner-inline-error">{scheduledError}</div>
+            {/if}
+
+            {#if scheduledLoading && !scheduledPending.length && !scheduledHistory.length}
+              <p class="owner-empty-note">Loading…</p>
+            {:else}
+              <h3 class="owner-schedule-group-title">Upcoming</h3>
+              {#if !scheduledPending.length}
+                <p class="owner-empty-note">Nothing scheduled. Use a client’s “Send” button and choose “Schedule for later”.</p>
+              {:else}
+                <div class="owner-schedule-list">
+                  {#each scheduledPending as item (item.id)}
+                    <article class="owner-schedule-card">
+                      <div class="owner-schedule-card-main">
+                        <strong>{item.clientName || item.email}</strong>
+                        <span class="owner-schedule-card-meta">
+                          {item.serviceType || 'Welcome email'} · {item.email}
+                        </span>
+                        <span class="owner-schedule-card-when">
+                          <Icon name="fas fa-clock" />
+                          {formatDateLabel(item.scheduledFor ?? '')}
+                        </span>
+                        {#if item.attempts > 0 && item.lastError}
+                          <span class="owner-schedule-card-retry">Retrying — last error: {item.lastError}</span>
+                        {/if}
+                      </div>
+                      {#if reschedulingId === item.id}
+                        <div class="owner-schedule-reschedule">
+                          <label class="owner-field owner-schedule-field">
+                            <span>New time</span>
+                            <input type="datetime-local" bind:value={rescheduleAt} disabled={scheduledActionId === item.id} />
+                          </label>
+                          <div class="owner-schedule-card-actions">
+                            <button type="button" class="owner-cancel-btn" on:click={cancelReschedule} disabled={scheduledActionId === item.id}>Cancel</button>
+                            <button type="button" class="owner-send-btn" on:click={() => saveReschedule(item.id)} disabled={scheduledActionId === item.id}>
+                              {scheduledActionId === item.id ? 'Saving…' : 'Save'}
+                            </button>
+                          </div>
+                        </div>
+                      {:else}
+                        <div class="owner-schedule-card-actions">
+                          <button type="button" class="owner-secondary-btn" on:click={() => startReschedule(item)} disabled={scheduledActionId === item.id}>
+                            <Icon name="fas fa-pen" />
+                            Reschedule
+                          </button>
+                          <button type="button" class="owner-cancel-btn" on:click={() => cancelScheduled(item.id)} disabled={scheduledActionId === item.id}>
+                            {scheduledActionId === item.id ? 'Cancelling…' : 'Cancel'}
+                          </button>
+                        </div>
+                      {/if}
+                    </article>
+                  {/each}
+                </div>
+              {/if}
+
+              {#if scheduledHistory.length}
+                <h3 class="owner-schedule-group-title">History</h3>
+                <div class="owner-schedule-list">
+                  {#each scheduledHistory as item (item.id)}
+                    <article class="owner-schedule-card owner-schedule-card-history">
+                      <div class="owner-schedule-card-main">
+                        <strong>{item.clientName || item.email}</strong>
+                        <span class="owner-schedule-card-meta">
+                          {item.serviceType || 'Welcome email'} · {item.email}
+                        </span>
+                        <span class="owner-schedule-card-when">
+                          {item.status === 'sent' && item.sentAt
+                            ? `Sent ${formatDateLabel(item.sentAt)}`
+                            : `Scheduled ${formatDateLabel(item.scheduledFor ?? '')}`}
+                        </span>
+                        {#if item.lastError}
+                          <span class="owner-schedule-card-retry">{item.lastError}</span>
+                        {/if}
+                      </div>
+                      <span class="owner-schedule-status" data-status={item.status}>{item.status}</span>
+                    </article>
+                  {/each}
+                </div>
+              {/if}
+            {/if}
           {:else if activeTab === 'activity'}
             <div class="activity-panel">
               <div class="activity-head">
@@ -1676,6 +2565,10 @@
               <Icon name="fas fa-envelope-open-text" />
               <span>Messaging</span>
             </button>
+            <button type="button" class:owner-bottom-tab-active={activeTab === 'scheduled'} class="owner-bottom-tab" on:click={() => setTab('scheduled')}>
+              <Icon name="fas fa-clock" />
+              <span>Scheduled</span>
+            </button>
             <button type="button" class:owner-bottom-tab-active={activeTab === 'activity'} class="owner-bottom-tab" on:click={() => setTab('activity')}>
               <Icon name="fas fa-clock-rotate-left" />
               <span>Activity</span>
@@ -1706,12 +2599,12 @@
           <p class="owner-modal-status">
             {#if confirmCtx.kind === 'message'}
               {#if confirmPreview}
-                A preview will be sent to <strong>{ownerEmail}</strong>. No clients will receive anything.
+                A preview will be sent to <strong>{previewRecipientList.join(', ') || ownerEmail}</strong>. No clients will receive anything.
               {:else}
                 This will email <strong>{confirmCtx.recipientCount}</strong> {confirmCtx.recipientCount === 1 ? 'client' : 'clients'} via BCC. Each recipient will see only Goodwalk in the To line.
               {/if}
             {:else if confirmPreview}
-              A preview will be sent to <strong>{ownerEmail}</strong> so you can see exactly what
+              A preview will be sent to <strong>{previewRecipientList.join(', ') || ownerEmail}</strong> so you can see exactly what
               {confirmCtx.client.fullName || confirmCtx.client.email} {confirmCtx.client.dogName ? `(${confirmCtx.client.dogName})` : ''} would receive.
             {:else}
               This will email <strong>{confirmCtx.client.fullName || confirmCtx.client.email}</strong>
@@ -1719,6 +2612,27 @@
             {/if}
           </p>
 
+          {#if confirmCtx.kind === 'welcome'}
+            <div class="owner-modal-fields">
+              <label class="owner-field owner-field-full">
+                <span>Subject</span>
+                <input bind:value={welcomeSubject} placeholder="Goodwalk Onboarding - Dog Name" disabled={confirmBusy} />
+              </label>
+              <label class="owner-field">
+                <span>Service</span>
+                <input bind:value={serviceType} on:input={scheduleWelcomePreview} placeholder="Tiny Gang Pack Walks" disabled={confirmBusy} />
+              </label>
+              <label class="owner-field">
+                <span>Price Details</span>
+                <input bind:value={priceDetails} on:input={scheduleWelcomePreview} placeholder="$45 per walk, invoiced weekly" disabled={confirmBusy} />
+              </label>
+              <label class="owner-field">
+                <span>Start Date</span>
+                <input bind:value={startDate} on:input={scheduleWelcomePreview} type="date" disabled={confirmBusy} />
+              </label>
+            </div>
+          {/if}
+
           <div class="owner-modal-preview-shell">
             {#if confirmPreviewHtml}
               <iframe
@@ -1746,9 +2660,66 @@
 
           <label class="owner-preview-toggle">
             <input type="checkbox" bind:checked={confirmPreview} disabled={confirmBusy} />
-            <span>Also send a test copy to me ({ownerEmail}) instead of the client</span>
+            <span>Send a preview instead of the client</span>
           </label>
 
+          {#if confirmCtx.kind === 'welcome' && !confirmPreview}
+            <div class="owner-schedule">
+              <div class="owner-schedule-modes" role="radiogroup" aria-label="When to send">
+                <button
+                  type="button"
+                  role="radio"
+                  aria-checked={sendMode === 'now'}
+                  class="owner-schedule-mode"
+                  class:owner-schedule-mode-active={sendMode === 'now'}
+                  on:click={() => (sendMode = 'now')}
+                  disabled={confirmBusy}
+                >
+                  <Icon name="fas fa-paper-plane" />
+                  Send now
+                </button>
+                <button
+                  type="button"
+                  role="radio"
+                  aria-checked={sendMode === 'later'}
+                  class="owner-schedule-mode"
+                  class:owner-schedule-mode-active={sendMode === 'later'}
+                  on:click={() => (sendMode = 'later')}
+                  disabled={confirmBusy}
+                >
+                  <Icon name="fas fa-clock" />
+                  Schedule for later
+                </button>
+              </div>
+              {#if sendMode === 'later'}
+                <label class="owner-field owner-schedule-field">
+                  <span>Send at</span>
+                  <input type="datetime-local" bind:value={scheduleAt} disabled={confirmBusy} />
+                </label>
+                <p class="owner-schedule-hint">
+                  Goodwalk will send this automatically at the chosen time, even if you’re offline. You can cancel or change it from the Scheduled tab.
+                </p>
+              {/if}
+            </div>
+          {/if}
+
+          {#if confirmPreview && previewEmails.length}
+            <div class="owner-preview-recipient-list">
+              <strong>Preview recipients</strong>
+              {#each previewEmails as email}
+                <label class="owner-preview-recipient">
+                  <input
+                    type="checkbox"
+                    checked={selectedPreviewEmails.has(email)}
+                    disabled={confirmBusy}
+                    on:change={() => togglePreviewRecipient(email)}
+                  />
+                  <span>{email}</span>
+                </label>
+              {/each}
+            </div>
+          {/if}
+
           {#if confirmError}
             <div class="owner-inline-error">{confirmError}</div>
           {/if}
@@ -1757,9 +2728,11 @@
             <button class="owner-cancel-btn" type="button" on:click={closeConfirm} disabled={confirmBusy}>Cancel</button>
             <button class="owner-send-btn" type="button" on:click={performConfirm} disabled={confirmBusy}>
               {#if confirmBusy}
-                Sending…
+                {confirmCtx.kind === 'welcome' && sendMode === 'later' && !confirmPreview ? 'Scheduling…' : 'Sending…'}
               {:else if confirmPreview}
                 Send preview
+              {:else if confirmCtx.kind === 'welcome' && sendMode === 'later'}
+                Schedule email
               {:else}
                 Send email
               {/if}
@@ -1808,13 +2781,44 @@
             </p>
           {/if}
 
+          {#if statusCtx.status === 'completed'}
+            <div class="owner-reset-onboarding">
+              <div class="owner-reset-copy">
+                <strong>Reset onboarding</strong>
+                <small>
+                  Keeps all saved details but marks onboarding incomplete, so {statusCtx.fullName || 'this client'}
+                  can sign in with their email and complete the new onboarding form. Their previous submission is kept on file.
+                </small>
+              </div>
+              {#if onboardingResetConfirming}
+                <div class="owner-reset-confirm">
+                  <span>Reset onboarding for this client?</span>
+                  <div class="owner-reset-confirm-actions">
+                    <button type="button" class="owner-cancel-btn" on:click={() => (onboardingResetConfirming = false)} disabled={onboardingResetBusy}>
+                      Keep as is
+                    </button>
+                    <button type="button" class="owner-reset-btn" on:click={resetOnboarding} disabled={onboardingResetBusy}>
+                      <Icon name={onboardingResetBusy ? 'fas fa-circle-notch' : 'fas fa-rotate-left'} className={onboardingResetBusy ? 'auth-spinner' : ''} />
+                      {onboardingResetBusy ? 'Resetting…' : 'Yes, reset'}
+                    </button>
+                  </div>
+                </div>
+              {:else}
+                <button type="button" class="owner-reset-btn" on:click={() => (onboardingResetConfirming = true)} disabled={statusBusy || onboardingResetBusy}>
+                  <Icon name="fas fa-rotate-left" />
+                  Reset onboarding
+                </button>
+              {/if}
+            </div>
+          {/if}
+
           {#if statusError}
             <div class="owner-inline-error">{statusError}</div>
           {/if}
 
           <div class="owner-compose-actions">
-            <button class="owner-cancel-btn" type="button" on:click={closeStatusEditor} disabled={statusBusy}>Cancel</button>
-            <button class="owner-send-btn" type="button" on:click={saveStatus} disabled={statusBusy}>
+            <button class="owner-cancel-btn" type="button" on:click={closeStatusEditor} disabled={statusBusy || onboardingResetBusy}>Cancel</button>
+            <button class="owner-send-btn" type="button" on:click={saveStatus} disabled={statusBusy || onboardingResetBusy}>
               {statusBusy ? 'Saving…' : 'Save status'}
             </button>
           </div>
@@ -1822,11 +2826,136 @@
       </div>
     {/if}
 
+    {#if addClientOpen}
+      <div class="owner-modal-backdrop" role="presentation" on:click|self={closeAddClient}>
+        <div class="owner-modal owner-modal-wide" role="dialog" aria-modal="true" aria-label="Add a new client" tabindex="-1">
+          <div class="owner-modal-head">
+            <h2>Add a new client</h2>
+            <button type="button" class="owner-modal-close" on:click={closeAddClient} aria-label="Close" disabled={addClientSaving}>
+              <Icon name="fas fa-xmark" />
+            </button>
+          </div>
+
+          <p class="owner-modal-status">
+            For clients who came from Instagram, Facebook, or a referral. Saving registers their email so they can sign in and fill out the onboarding form.
+          </p>
+
+          <div class="owner-compose-grid owner-compose-grid-modal">
+            <label class="owner-field">
+              <span>Owner name</span>
+              <input bind:value={addClientForm.fullName} placeholder="Owner full name" />
+            </label>
+
+            <label class="owner-field">
+              <span>Owner email</span>
+              <input bind:value={addClientForm.email} type="email" placeholder="owner@example.com" />
+            </label>
+
+            <label class="owner-field">
+              <span>Owner phone</span>
+              <input bind:value={addClientForm.phone} type="tel" placeholder="021 234 5678" />
+            </label>
+
+            <label class="owner-field">
+              <span>Came from</span>
+              <input bind:value={addClientForm.source} placeholder="Instagram, Facebook, referral…" />
+            </label>
+
+            <label class="owner-field">
+              <span>Dog name</span>
+              <input bind:value={addClientForm.dogName} placeholder="Dog name" />
+            </label>
+
+            <label class="owner-field">
+              <span>Dog breed</span>
+              <input bind:value={addClientForm.dogBreed} placeholder="Dog breed" />
+            </label>
+
+            <label class="owner-field owner-field-full">
+              <span>Owner address</span>
+              <input bind:value={addClientForm.address} placeholder="Street, suburb, city" />
+            </label>
+          </div>
+
+          <label class="owner-preview-toggle">
+            <input type="checkbox" bind:checked={addClientForm.createInMyob} disabled={addClientSaving} />
+            <span>Also create this client in MYOB</span>
+          </label>
+
+          {#if addClientError}
+            <div class="owner-inline-error">{addClientError}</div>
+          {/if}
+
+          <div class="owner-compose-actions">
+            <button class="owner-cancel-btn" type="button" on:click={closeAddClient} disabled={addClientSaving}>Cancel</button>
+            <button class="owner-send-btn" type="button" on:click={saveNewClient} disabled={addClientSaving}>
+              {#if addClientSaving}Adding…{:else}Add client{/if}
+            </button>
+          </div>
+        </div>
+      </div>
+    {/if}
+
+    {#if editingEmail}
+      <div class="owner-modal-backdrop" role="presentation" on:click|self={resetProfileEditor}>
+        <div class="owner-modal owner-modal-wide" role="dialog" aria-modal="true" aria-label="Edit client details" tabindex="-1">
+          <div class="owner-modal-head">
+            <h2>Edit details for {profileEditorLabel || editingEmail}</h2>
+            <button type="button" class="owner-modal-close" on:click={resetProfileEditor} aria-label="Close" disabled={profileSaving}>
+              <Icon name="fas fa-xmark" />
+            </button>
+          </div>
+
+          <p class="owner-modal-status">
+            Update the saved owner and dog details here. Changes apply everywhere this client appears in the control panel.
+          </p>
+
+          <div class="owner-compose-grid owner-compose-grid-modal">
+            <label class="owner-field">
+              <span>Owner name</span>
+              <input bind:value={profileForm.fullName} placeholder="Owner full name" />
+            </label>
+
+            <label class="owner-field">
+              <span>Owner email</span>
+              <input bind:value={profileForm.email} type="email" placeholder="owner@example.com" />
+            </label>
+
+            <label class="owner-field">
+              <span>Owner phone</span>
+              <input bind:value={profileForm.phone} type="tel" placeholder="021 234 5678" />
+            </label>
+
+            <label class="owner-field">
+              <span>Dog name</span>
+              <input bind:value={profileForm.dogName} placeholder="Dog name" />
+            </label>
+
+            <label class="owner-field owner-field-full">
+              <span>Owner address</span>
+              <input bind:value={profileForm.address} placeholder="Street, suburb, city" />
+            </label>
+          </div>
+
+          {#if profileError}
+            <div class="owner-inline-error">{profileError}</div>
+          {/if}
+
+          <div class="owner-compose-actions">
+            <button class="owner-cancel-btn" type="button" on:click={resetProfileEditor} disabled={profileSaving}>Cancel</button>
+            <button class="owner-send-btn" type="button" on:click={saveProfileEdits} disabled={profileSaving}>
+              {#if profileSaving}Saving…{:else}Save details{/if}
+            </button>
+          </div>
+        </div>
+      </div>
+    {/if}
+
     {#if enquiryOpen}
       <div class="owner-modal-backdrop" role="presentation" on:click|self={closeEnquiry}>
         <div class="owner-modal" role="dialog" aria-modal="true" aria-label="Client enquiry" tabindex="-1">
           <div class="owner-modal-head">
-            <h2>Website enquiry</h2>
+            <h2>Website enquiry{#if enquiryClientLabel} for {enquiryClientLabel}{/if}</h2>
             <button type="button" class="owner-modal-close" on:click={closeEnquiry} aria-label="Close">
               <Icon name="fas fa-xmark" />
             </button>
@@ -1866,39 +2995,150 @@
                 <div><dt>Referrer</dt><dd>{enquiry.referrer}</dd></div>
               {/if}
             </dl>
-
-            {#if enquiryJourney}
-              {@const events = mergedJourneyEvents(enquiryJourney)}
-              <section class="owner-journey">
-                <header class="owner-journey-head">
-                  <h3>Visitor journey</h3>
-                  <small>{events.length} event{events.length === 1 ? '' : 's'} before they submitted</small>
-                </header>
-                {#if events.length === 0}
-                  <p class="owner-journey-empty">No browsing events were recorded for this submission.</p>
-                {:else}
-                  <ol class="owner-journey-list">
-                    {#each events as evt}
-                      <li>
-                        <span class="owner-journey-time">{formatJourneyTime(evt.ts)}</span>
-                        <span class="owner-journey-event">{describeJourneyEvent(evt)}</span>
-                        {#if evt.page_path}
-                          <span class="owner-journey-path">{evt.page_path}</span>
-                        {/if}
-                      </li>
-                    {/each}
-                  </ol>
-                {/if}
-              </section>
-            {/if}
           {/if}
         </div>
       </div>
     {/if}
 
+    {#if journeyOpen}
+      <div class="owner-modal-backdrop" role="presentation" on:click|self={closeJourney}>
+        <div class="owner-modal owner-modal-wide" role="dialog" aria-modal="true" aria-label="Client journey" tabindex="-1">
+          <div class="owner-modal-head">
+            <h2>Visitor journey{#if journeyClientLabel} for {journeyClientLabel}{/if}</h2>
+            <button type="button" class="owner-modal-close" on:click={closeJourney} aria-label="Close">
+              <Icon name="fas fa-xmark" />
+            </button>
+          </div>
+
+          {#if journeyLoading}
+            <p class="owner-modal-status">Loading…</p>
+          {:else if journeyError}
+            <div class="owner-inline-error">{journeyError}</div>
+          {:else}
+            {@const events = mergedJourneyEvents(journeyData)}
+            <section class="owner-journey owner-journey-standalone">
+              <header class="owner-journey-head">
+                <h3>Tracking timeline</h3>
+                <small>{events.length} event{events.length === 1 ? '' : 's'} before they submitted</small>
+              </header>
+              {#if events.length === 0}
+                <p class="owner-journey-empty">No browsing events were recorded for this submission.</p>
+              {:else}
+                <ol class="owner-journey-list">
+                  {#each events as evt}
+                    <li>
+                      <span class="owner-journey-time">{formatJourneyTime(evt.ts)}</span>
+                      <span class="owner-journey-event">{describeJourneyEvent(evt)}</span>
+                      {#if evt.page_path}
+                        <span class="owner-journey-path">{evt.page_path}</span>
+                      {/if}
+                    </li>
+                  {/each}
+                </ol>
+              {/if}
+            </section>
+          {/if}
+        </div>
+      </div>
+    {/if}
+
+    {#if viewAsSetupOpen}
+      <div class="owner-modal-backdrop" role="presentation" on:click|self={closeViewAsSetup}>
+        <div class="owner-modal" role="dialog" aria-modal="true" aria-label="View as client" tabindex="-1">
+          <div class="owner-modal-head">
+            <h2>View as client</h2>
+            <button type="button" class="owner-modal-close" on:click={closeViewAsSetup} aria-label="Close">
+              <Icon name="fas fa-xmark" />
+            </button>
+          </div>
+
+          <p class="owner-modal-status">
+            Step through <strong>{viewAsSetupClient?.fullName || viewAsSetupClient?.email || 'this client'}</strong>'s
+            onboarding exactly as they see it. By default this is a dry run — nothing is saved and nothing is
+            sent to the client.
+          </p>
+
+          <label class="view-as-check">
+            <input type="checkbox" bind:checked={viewAsPreviewSend} />
+            <span>Email the completed run-through to an address</span>
+          </label>
+
+          {#if viewAsPreviewSend}
+            <label class="owner-field">
+              <span>Send preview to</span>
+              <input type="email" bind:value={viewAsPreviewEmail} placeholder="you@example.com" autocomplete="email" />
+            </label>
+            <p class="view-as-hint">
+              <Icon name="fas fa-circle-info" />
+              The result is emailed to this address only — never to the client.
+            </p>
+          {/if}
+
+          {#if viewAsSetupError}
+            <div class="owner-inline-error">{viewAsSetupError}</div>
+          {/if}
+
+          <div class="owner-compose-actions view-as-actions">
+            <button class="owner-cancel-btn" type="button" on:click={closeViewAsSetup}>Cancel</button>
+            <button class="owner-send-btn" type="button" on:click={confirmClientView}>
+              <Icon name="fas fa-play" />
+              Start preview
+            </button>
+          </div>
+        </div>
+      </div>
+    {/if}
+
   {/if}
 </main>
 
+{#if viewAsOpen}
+  <!-- Rendered outside .owner-page so the dashboard's laptop zoom does not
+       scale the replica; this overlay shows the client's onboarding exactly. -->
+  <div class="view-as-overlay" role="dialog" aria-modal="true" aria-label="Client onboarding preview">
+    <div class="view-as-bar">
+      <div class="view-as-bar-info">
+        <span class="view-as-badge"><Icon name="fas fa-user-secret" /> Impersonating</span>
+        <span class="view-as-title">
+          Previewing as <strong>{viewAsLabel || 'client'}</strong>
+        </span>
+        <span class="view-as-subnote" class:view-as-subnote-live={viewAsPreviewSend}>
+          {#if viewAsPreviewSend}
+            <Icon name="fas fa-paper-plane" /> Result emails to {viewAsPreviewEmail}
+          {:else}
+            <Icon name="fas fa-flask" /> Dry run — nothing is sent or saved
+          {/if}
+        </span>
+      </div>
+      <button type="button" class="view-as-close" on:click={closeClientView}>
+        <Icon name="fas fa-xmark" />
+        <span>Close</span>
+      </button>
+    </div>
+    <div class="view-as-body">
+      {#if viewAsError}
+        <div class="view-as-error">
+          <Icon name="fas fa-triangle-exclamation" />
+          <p>{viewAsError}</p>
+        </div>
+      {:else if viewAsData}
+        {#key viewAsData.email}
+          <OnboardingPage impersonation impersonationData={viewAsData} onImpersonationSubmit={impersonationSubmit} />
+        {/key}
+      {/if}
+    </div>
+  </div>
+{/if}
+
+<svelte:window
+  on:keydown={(e) => {
+    if (e.key !== 'Escape') return;
+    if (viewAsOpen) closeClientView();
+    else if (openMenuEmail) closeRowMenu();
+  }}
+  on:click={() => { if (openMenuEmail) closeRowMenu(); }}
+/>
+
 <style>
   .owner-page {
     /* Scope a clean Inter type system to the admin only — leaves the public
@@ -1914,6 +3154,15 @@
     -webkit-text-size-adjust: 100%;
 
     min-height: 100vh;
+    --owner-surface: oklch(0.985 0.008 95);
+    --owner-surface-strong: oklch(0.998 0.004 95);
+    --owner-border: oklch(0.83 0.012 95 / 0.42);
+    --owner-border-strong: oklch(0.71 0.026 145 / 0.34);
+    --owner-text-soft: oklch(0.43 0.026 145 / 0.78);
+    --owner-chip: oklch(0.95 0.012 95);
+    --owner-chip-strong: oklch(0.9 0.028 103);
+    --owner-shadow-soft: 0 10px 24px rgba(28, 36, 28, 0.05);
+    --owner-shadow-hover: 0 20px 38px rgba(28, 36, 28, 0.09);
     background: #f7f6f1;
     color: var(--gw-green);
     display: flex;
@@ -2068,8 +3317,9 @@
   .owner-summary-pill {
     padding: 10px 12px;
     border-radius: 12px;
-    background: #fff;
-    border: 1px solid rgba(17, 20, 24, 0.07);
+    background: var(--owner-surface-strong);
+    border: 1px solid rgba(17, 20, 24, 0.06);
+    box-shadow: var(--owner-shadow-soft);
     display: flex;
     align-items: center;
     gap: 10px;
@@ -2111,6 +3361,27 @@
     margin-bottom: 12px;
   }
 
+  .owner-section-copy {
+    display: grid;
+    gap: 4px;
+  }
+
+  .owner-section-copy h2 {
+    margin: 0;
+    color: #171b20;
+    font-family: var(--font-head);
+    font-size: 19px;
+    line-height: 1.1;
+    letter-spacing: -0.02em;
+  }
+
+  .owner-section-copy p {
+    margin: 0;
+    color: rgba(33, 48, 33, 0.62);
+    font-size: 13px;
+    line-height: 1.45;
+  }
+
   .owner-section-head-meta {
     justify-content: flex-end;
   }
@@ -2141,10 +3412,12 @@
 
   .owner-message-card,
   .owner-table-row {
-    padding: 10px 12px;
-    border-radius: 12px;
-    background: #fff;
-    border: 1px solid rgba(17, 20, 24, 0.07);
+    padding: 16px 20px;
+    border-radius: 16px;
+    background:
+      linear-gradient(180deg, rgba(255, 255, 255, 0.98), rgba(249, 248, 243, 0.98));
+    border: 1px solid var(--owner-border);
+    box-shadow: var(--owner-shadow-soft);
   }
 
   .owner-message-card-error {
@@ -2153,20 +3426,20 @@
 
   .owner-table-shell {
     display: grid;
-    gap: 6px;
+    gap: 12px;
   }
 
   .owner-table {
     display: grid;
-    gap: 8px;
+    gap: 10px;
   }
 
   .owner-table-home {
-    grid-template-columns: minmax(0, 1.1fr) minmax(0, 1fr) minmax(0, 0.7fr) minmax(260px, auto);
+    grid-template-columns: minmax(0, 1.2fr) minmax(0, 1fr) minmax(0, 0.7fr) minmax(220px, auto);
   }
 
   .owner-table-clients {
-    grid-template-columns: minmax(0, 1.4fr) minmax(0, 0.8fr) minmax(0, 0.9fr) auto;
+    grid-template-columns: minmax(0, 1.5fr) minmax(0, 0.9fr) minmax(0, 0.85fr) minmax(220px, auto);
   }
 
   .owner-table-birthdays {
@@ -2175,7 +3448,7 @@
 
   .owner-table-head {
     display: none;
-    padding: 0 14px 2px;
+    padding: 0 20px 4px;
     color: rgba(33, 48, 33, 0.54);
     font-size: 12px;
     font-weight: 700;
@@ -2185,11 +3458,17 @@
 
   .owner-cell {
     display: grid;
-    gap: 4px;
+    gap: 6px;
     align-content: start;
     min-width: 0;
   }
 
+  .owner-primary-stack {
+    display: grid;
+    gap: 6px;
+    min-width: 0;
+  }
+
   .owner-cell h3 {
     margin: 0;
     color: #171b20;
@@ -2201,7 +3480,7 @@
 
   .owner-cell p {
     margin: 2px 0 0;
-    color: rgba(33, 48, 33, 0.62);
+    color: rgba(33, 48, 33, 0.6);
     font-size: 12px;
     line-height: 1.4;
   }
@@ -2216,14 +3495,14 @@
 
   .owner-info-stack {
     display: grid;
-    gap: 3px;
+    gap: 4px;
   }
 
   .owner-contact-row {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    gap: 4px 10px;
+    gap: 6px 10px;
     min-width: 0;
   }
 
@@ -2244,6 +3523,38 @@
     overflow-wrap: anywhere;
   }
 
+  .owner-glance-row {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    min-height: 26px;
+    opacity: 0.82;
+    transform: translateY(0);
+    transition:
+      opacity 0.2s cubic-bezier(0.22, 1, 0.36, 1),
+      transform 0.2s cubic-bezier(0.22, 1, 0.36, 1);
+  }
+
+  .owner-glance-chip {
+    display: inline-flex;
+    align-items: center;
+    min-height: 24px;
+    padding: 0 10px;
+    border-radius: 999px;
+    background: var(--owner-chip-strong);
+    color: rgba(33, 48, 33, 0.84);
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: 0.02em;
+    white-space: nowrap;
+  }
+
+  .owner-glance-chip-quiet {
+    background: var(--owner-chip);
+    color: var(--owner-text-soft);
+    font-weight: 600;
+  }
+
   .owner-status-pill {
     display: inline-flex;
     align-items: center;
@@ -2399,6 +3710,7 @@
       background 0.18s ease,
       border-color 0.18s ease,
       color 0.18s ease,
+      box-shadow 0.18s ease,
       transform 0.18s cubic-bezier(0.22, 1, 0.36, 1);
   }
 
@@ -2406,7 +3718,7 @@
   .owner-download-btn {
     border: 0;
     background: #213021;
-    color: #fff;
+    color: #f8f7f2;
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -2416,8 +3728,8 @@
   .owner-secondary-btn,
   .owner-cancel-btn,
   .owner-page-btn {
-    border: 1px solid rgba(33, 48, 33, 0.14);
-    background: #fff;
+    border: 1px solid rgba(33, 48, 33, 0.12);
+    background: rgba(255, 255, 255, 0.88);
     color: #213021;
     display: inline-flex;
     align-items: center;
@@ -2450,23 +3762,259 @@
     gap: 8px;
   }
 
-  .owner-action-row {
+  .owner-action-buttons {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .owner-action-buttons > button {
+    flex: 1 1 auto;
+  }
+
+  /* ── Row "more actions" (⋯) menu ───────────────────────────────────────── */
+  .owner-menu-wrap {
+    position: relative;
+    display: inline-flex;
+    flex: 0 0 auto;
+  }
+
+  .owner-menu-trigger {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 42px;
+    min-height: 42px;
+    padding: 0;
+    border-radius: 999px;
+    border: 1px solid rgba(33, 48, 33, 0.12);
+    background: rgba(255, 255, 255, 0.88);
+    color: #213021;
+    cursor: pointer;
+    transition: background 0.18s ease, border-color 0.18s ease, box-shadow 0.18s ease;
+  }
+
+  .owner-menu-trigger:hover,
+  .owner-menu-trigger-active {
+    background: #fff;
+    border-color: var(--owner-border-strong);
+    box-shadow: 0 6px 16px rgba(28, 36, 28, 0.08);
+  }
+
+  .owner-menu-trigger :global(i) {
+    font-size: 15px;
+  }
+
+  .owner-menu {
+    position: absolute;
+    top: calc(100% + 6px);
+    right: 0;
+    z-index: 30;
+    min-width: 186px;
+    padding: 6px;
+    display: grid;
+    gap: 2px;
+    border-radius: 14px;
+    background: #fff;
+    border: 1px solid var(--owner-border);
+    box-shadow: 0 18px 40px rgba(28, 36, 28, 0.18);
+    animation: owner-menu-in 0.14s ease;
+  }
+
+  @keyframes owner-menu-in {
+    from { opacity: 0; transform: translateY(-4px); }
+    to { opacity: 1; transform: translateY(0); }
+  }
+
+  .owner-menu-item {
+    display: inline-flex;
+    align-items: center;
+    gap: 10px;
+    width: 100%;
+    padding: 9px 12px;
+    border: 0;
+    border-radius: 9px;
+    background: transparent;
+    color: #213021;
+    font: inherit;
+    font-size: 13px;
+    font-weight: 600;
+    text-align: left;
+    cursor: pointer;
+    transition: background 0.14s ease;
+  }
+
+  .owner-menu-item :global(i) {
+    width: 16px;
+    text-align: center;
+    color: rgba(33, 48, 33, 0.6);
+  }
+
+  .owner-menu-item:hover {
+    background: rgba(33, 48, 33, 0.06);
+  }
+
+  .owner-menu-item:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
+
+  /* Let an open menu escape the row's clip and sit above sibling rows. */
+  .owner-row-interactive.owner-row-menu-open {
+    overflow: visible;
+    z-index: 20;
+  }
+
+  .owner-section-link {
+    flex: 0 0 auto;
+  }
+
+  .owner-section-actions {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    flex: 0 0 auto;
+  }
+
+  .owner-reset-onboarding {
+    margin-top: 18px;
+    padding: 16px;
+    border: 1px solid rgba(33, 48, 33, 0.14);
+    border-radius: 12px;
+    background: rgba(33, 48, 33, 0.03);
+    display: grid;
+    gap: 12px;
+  }
+
+  .owner-reset-copy {
+    display: grid;
+    gap: 4px;
+  }
+
+  .owner-reset-copy strong {
+    color: #171b20;
+    font-size: 14px;
+  }
+
+  .owner-reset-copy small {
+    color: rgba(33, 48, 33, 0.62);
+    font-size: 12.5px;
+    line-height: 1.5;
+  }
+
+  .owner-reset-btn {
+    align-self: start;
+    min-height: 40px;
+    padding: 0 16px;
+    border-radius: 999px;
+    border: 1px solid rgba(33, 48, 33, 0.22);
+    background: #ffffff;
+    color: #213021;
+    font: inherit;
+    font-size: 13px;
+    font-weight: 700;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    transition: background 0.18s ease, border-color 0.18s ease;
+  }
+
+  .owner-reset-btn:hover:not(:disabled) {
+    background: rgba(33, 48, 33, 0.06);
+    border-color: rgba(33, 48, 33, 0.35);
+  }
+
+  .owner-reset-btn:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
+
+  .owner-reset-confirm {
+    display: grid;
+    gap: 10px;
+  }
+
+  .owner-reset-confirm > span {
+    color: #171b20;
+    font-size: 13px;
+    font-weight: 600;
+  }
+
+  .owner-reset-confirm-actions {
     display: flex;
     flex-wrap: wrap;
     gap: 8px;
   }
 
-  .owner-action-row > button {
-    flex: 1 1 auto;
+  .owner-profile-card {
+    background: rgba(255, 255, 255, 0.82);
   }
 
-  .owner-compose-card {
-    grid-column: 1 / -1;
-    padding: 16px;
-    border-radius: 20px;
-    background: rgba(255, 248, 225, 0.5);
-    box-shadow: inset 0 0 0 1px rgba(33, 48, 33, 0.06);
+  .owner-row-interactive {
+    position: relative;
+    overflow: clip;
+    transition:
+      transform 0.22s cubic-bezier(0.22, 1, 0.36, 1),
+      border-color 0.22s cubic-bezier(0.22, 1, 0.36, 1),
+      box-shadow 0.22s cubic-bezier(0.22, 1, 0.36, 1),
+      background 0.22s cubic-bezier(0.22, 1, 0.36, 1);
+  }
+
+  .owner-row-interactive::before {
+    content: '';
+    position: absolute;
+    inset: 0;
+    background: linear-gradient(90deg, rgba(255, 209, 0, 0.07), rgba(255, 255, 255, 0));
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 0.22s cubic-bezier(0.22, 1, 0.36, 1);
+  }
+
+  .owner-row-interactive:hover,
+  .owner-row-interactive:focus-within {
+    transform: translateY(-2px);
+    border-color: var(--owner-border-strong);
+    box-shadow: var(--owner-shadow-hover);
+    background:
+      linear-gradient(180deg, rgba(255, 255, 255, 1), rgba(252, 250, 243, 1));
+  }
+
+  .owner-row-interactive:hover::before,
+  .owner-row-interactive:focus-within::before {
+    opacity: 1;
+  }
+
+  .owner-row-interactive:hover .owner-glance-row,
+  .owner-row-interactive:focus-within .owner-glance-row {
+    opacity: 1;
+    transform: translateY(-1px);
+  }
+
+  .owner-row-interactive:hover .owner-open-btn,
+  .owner-row-interactive:hover .owner-download-btn,
+  .owner-row-interactive:hover .owner-secondary-btn,
+  .owner-row-interactive:focus-within .owner-open-btn,
+  .owner-row-interactive:focus-within .owner-download-btn,
+  .owner-row-interactive:focus-within .owner-secondary-btn {
+    box-shadow: 0 10px 20px rgba(28, 36, 28, 0.08);
+  }
+
+  .owner-open-btn:focus-visible,
+  .owner-send-btn:focus-visible,
+  .owner-download-btn:focus-visible,
+  .owner-secondary-btn:focus-visible,
+  .owner-page-btn:focus-visible,
+  .owner-topbar-tab:focus-visible,
+  .owner-topbar-logout:focus-visible {
+    outline: 2px solid rgba(255, 209, 0, 0.95);
+    outline-offset: 2px;
+  }
+
+  .owner-compose-grid {
     display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
     gap: 12px;
   }
 
@@ -2475,6 +4023,10 @@
     gap: 7px;
   }
 
+  .owner-field-full {
+    grid-column: 1 / -1;
+  }
+
   .owner-field span {
     color: rgba(33, 48, 33, 0.54);
     font-size: 12px;
@@ -2501,6 +4053,10 @@
     box-shadow: 0 0 0 4px rgba(255, 209, 0, 0.12);
   }
 
+  .owner-compose-grid-modal {
+    margin-bottom: 6px;
+  }
+
   .owner-inline-error {
     padding: 12px 14px;
     border-radius: 14px;
@@ -2678,6 +4234,10 @@
       display: grid;
     }
 
+    .owner-table {
+      column-gap: 22px;
+    }
+
     .owner-table-row {
       align-items: center;
     }
@@ -2686,7 +4246,7 @@
       display: none;
     }
 
-    .owner-action-row > button {
+    .owner-action-buttons > button {
       flex: 0 0 auto;
     }
 
@@ -2708,6 +4268,32 @@
     }
   }
 
+  /* ── Laptop and larger ──────────────────────────────────────────────────
+     The dashboard is tuned mobile-first with a dense 11–13px type scale that
+     reads small on a laptop. Lift the whole surface so text and controls are
+     more legible and the content uses more of the wider screen, instead of
+     re-tuning ~70 individual sizes. min-height is divided back out so the
+     scaled page still fills exactly one viewport (no phantom scrollbar). */
+  @media (min-width: 1280px) {
+    .owner-page {
+      zoom: 1.08;
+      min-height: calc(100vh / 1.08);
+    }
+  }
+
+  @media (min-width: 1600px) {
+    .owner-page {
+      zoom: 1.12;
+      min-height: calc(100vh / 1.12);
+    }
+
+    /* Roomier shells now there is space, so the wider type isn't cramped. */
+    .owner-shell,
+    .owner-shell-wide {
+      max-width: 1200px;
+    }
+  }
+
   .msg-layout {
     display: grid;
     grid-template-columns: 1fr;
@@ -3102,6 +4688,10 @@
     box-shadow: 0 24px 60px rgba(17, 20, 24, 0.28);
   }
 
+  .owner-modal-wide {
+    max-width: 680px;
+  }
+
   .owner-modal-preview-shell {
     margin: 6px 0 14px;
     border-radius: 14px;
@@ -3233,6 +4823,216 @@
     cursor: pointer;
   }
 
+  /* Welcome compose fields inside the send dialog. */
+  .owner-modal-fields {
+    display: grid;
+    gap: 12px;
+    margin-bottom: 16px;
+  }
+
+  /* Send-now / schedule controls inside the send dialog. */
+  .owner-schedule {
+    display: grid;
+    gap: 12px;
+    padding: 14px;
+    border-radius: 14px;
+    border: 1px solid rgba(33, 48, 33, 0.08);
+    background: rgba(248, 246, 238, 0.7);
+    margin-bottom: 12px;
+  }
+
+  .owner-schedule-modes {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px;
+  }
+
+  .owner-schedule-mode {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    padding: 10px 12px;
+    border-radius: 10px;
+    border: 1px solid rgba(33, 48, 33, 0.14);
+    background: #fff;
+    color: #213021;
+    font-size: 14px;
+    font-weight: 600;
+    cursor: pointer;
+    transition:
+      background 0.18s cubic-bezier(0.22, 1, 0.36, 1),
+      border-color 0.18s cubic-bezier(0.22, 1, 0.36, 1);
+  }
+
+  .owner-schedule-mode:hover:not(:disabled) {
+    border-color: rgba(33, 48, 33, 0.3);
+  }
+
+  .owner-schedule-mode-active {
+    background: #213021;
+    border-color: #213021;
+    color: #ffd100;
+  }
+
+  .owner-schedule-mode:disabled {
+    cursor: default;
+    opacity: 0.6;
+  }
+
+  .owner-schedule-field {
+    margin: 0;
+  }
+
+  .owner-schedule-hint {
+    margin: 0;
+    font-size: 13px;
+    line-height: 1.5;
+    color: #4c5056;
+  }
+
+  /* Scheduled tab list. */
+  .owner-empty-note {
+    margin: 0 0 20px;
+    color: #5f6369;
+    font-size: 14px;
+  }
+
+  .owner-schedule-group-title {
+    font-family: var(--font-head, inherit);
+    font-size: 15px;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: #213021;
+    margin: 8px 0 12px;
+  }
+
+  .owner-schedule-list {
+    display: grid;
+    gap: 10px;
+    margin-bottom: 24px;
+  }
+
+  .owner-schedule-card {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    gap: 14px;
+    padding: 14px 16px;
+    border-radius: 14px;
+    border: 1px solid rgba(33, 48, 33, 0.08);
+    background: #fff;
+    box-shadow: 0 8px 20px rgba(28, 36, 28, 0.04);
+  }
+
+  .owner-schedule-card-history {
+    background: rgba(248, 246, 238, 0.6);
+    box-shadow: none;
+  }
+
+  .owner-schedule-card-main {
+    display: grid;
+    gap: 3px;
+    min-width: 0;
+  }
+
+  .owner-schedule-card-main strong {
+    font-size: 15px;
+    color: #1f2421;
+  }
+
+  .owner-schedule-card-meta {
+    font-size: 13px;
+    color: #5f6369;
+  }
+
+  .owner-schedule-card-when {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 13px;
+    font-weight: 600;
+    color: #213021;
+  }
+
+  .owner-schedule-card-retry {
+    font-size: 12px;
+    color: #b4501e;
+  }
+
+  .owner-schedule-card-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  .owner-schedule-reschedule {
+    display: grid;
+    gap: 10px;
+    width: min(100%, 320px);
+  }
+
+  .owner-schedule-status {
+    font-size: 12px;
+    font-weight: 700;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+    padding: 4px 10px;
+    border-radius: 999px;
+    background: rgba(33, 48, 33, 0.08);
+    color: #213021;
+  }
+
+  .owner-schedule-status[data-status='sent'] {
+    background: rgba(45, 120, 60, 0.14);
+    color: #246b32;
+  }
+
+  .owner-schedule-status[data-status='failed'] {
+    background: rgba(201, 64, 64, 0.14);
+    color: #b03333;
+  }
+
+  .owner-schedule-status[data-status='cancelled'] {
+    background: rgba(89, 96, 109, 0.14);
+    color: #59606d;
+  }
+
+  .owner-preview-recipient-list {
+    display: grid;
+    gap: 8px;
+    padding: 12px;
+    border-radius: 12px;
+    border: 1px solid rgba(33, 48, 33, 0.08);
+    background: rgba(248, 246, 238, 0.92);
+    margin-bottom: 12px;
+  }
+
+  .owner-preview-recipient-list strong {
+    font-size: 12px;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    color: rgba(33, 48, 33, 0.64);
+  }
+
+  .owner-preview-recipient {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: #213021;
+    font-size: 13px;
+    cursor: pointer;
+  }
+
+  .owner-preview-recipient input {
+    width: 16px;
+    height: 16px;
+    accent-color: #213021;
+    cursor: pointer;
+  }
+
   .owner-enquiry-list {
     margin: 0;
     display: grid;
@@ -3284,6 +5084,12 @@
     border-top: 1px solid rgba(33, 48, 33, 0.12);
   }
 
+  .owner-journey-standalone {
+    margin-top: 6px;
+    padding-top: 0;
+    border-top: 0;
+  }
+
   .owner-journey-head {
     display: flex;
     align-items: baseline;
@@ -3409,8 +5215,13 @@
       flex-direction: column;
     }
 
+    .owner-section-link {
+      width: 100%;
+    }
+
     .owner-table-row,
-    .owner-compose-actions {
+    .owner-compose-actions,
+    .owner-compose-grid {
       grid-template-columns: 1fr;
     }
 
@@ -3557,4 +5368,184 @@
   .activity-status-cell[data-status="ignored"] { color: #b87800; }
   .activity-status-cell[data-status="partial"] { color: #b87800; }
   .activity-detail { color: #666; max-width: 480px; word-break: break-word; }
+
+  /* ── View as client (read-only impersonation overlay) ───────────────────── */
+  .view-as-overlay {
+    position: fixed;
+    inset: 0;
+    z-index: 200;
+    display: flex;
+    flex-direction: column;
+    background: #f7f6f1;
+  }
+
+  .view-as-bar {
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 10px 16px;
+    padding-top: calc(10px + env(safe-area-inset-top, 0px));
+    background: #213021;
+    color: #fff;
+    box-shadow: 0 2px 10px rgba(17, 20, 24, 0.18);
+  }
+
+  .view-as-bar-info {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    min-width: 0;
+    font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif;
+  }
+
+  .view-as-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    flex: 0 0 auto;
+    padding: 5px 11px;
+    border-radius: 999px;
+    background: var(--yellow);
+    color: #213021;
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+  }
+
+  .view-as-title {
+    font-size: 14px;
+    color: rgba(255, 255, 255, 0.85);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .view-as-title strong {
+    color: #fff;
+    font-weight: 700;
+  }
+
+  .view-as-subnote {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    flex: 0 1 auto;
+    min-width: 0;
+    padding: 4px 10px;
+    border-radius: 999px;
+    background: rgba(255, 255, 255, 0.12);
+    color: rgba(255, 255, 255, 0.82);
+    font-size: 12px;
+    font-weight: 600;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .view-as-subnote-live {
+    background: rgba(255, 209, 0, 0.22);
+    color: #ffe27a;
+  }
+
+  .view-as-subnote :global(i) {
+    font-size: 11px;
+    flex: 0 0 auto;
+  }
+
+  .view-as-check {
+    display: flex;
+    align-items: flex-start;
+    gap: 10px;
+    margin-bottom: 12px;
+    padding: 12px 14px;
+    border-radius: 12px;
+    border: 1px solid var(--owner-border);
+    background: var(--owner-surface);
+    cursor: pointer;
+    font-size: 14px;
+    font-weight: 600;
+    color: #213021;
+  }
+
+  .view-as-actions {
+    margin-top: 16px;
+  }
+
+  .view-as-check input {
+    width: 18px;
+    height: 18px;
+    margin-top: 1px;
+    flex: 0 0 auto;
+    accent-color: #213021;
+    cursor: pointer;
+  }
+
+  .view-as-hint {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    margin: 2px 0 0;
+    color: var(--owner-text-soft);
+    font-size: 12.5px;
+    line-height: 1.4;
+  }
+
+  .view-as-hint :global(i) {
+    color: rgba(33, 48, 33, 0.5);
+  }
+
+  .view-as-close {
+    flex: 0 0 auto;
+    display: inline-flex;
+    align-items: center;
+    gap: 7px;
+    padding: 8px 14px;
+    border-radius: 999px;
+    border: 1px solid rgba(255, 255, 255, 0.22);
+    background: transparent;
+    color: #fff;
+    font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif;
+    font-size: 13px;
+    font-weight: 700;
+    cursor: pointer;
+    transition: background 0.15s;
+  }
+
+  .view-as-close:hover {
+    background: rgba(255, 255, 255, 0.12);
+  }
+
+  .view-as-body {
+    flex: 1 1 auto;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+    /* The replica's own <main> sets its background; clip so it scrolls within
+       the overlay rather than the whole document. */
+    position: relative;
+  }
+
+  .view-as-error {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+    text-align: center;
+    max-width: 420px;
+    margin: 80px auto;
+    padding: 0 20px;
+    color: #8a2b22;
+  }
+
+  .view-as-error :global(i) {
+    font-size: 30px;
+  }
+
+  .view-as-error p {
+    margin: 0;
+    font-size: 15px;
+    line-height: 1.5;
+  }
 </style>
diff --git a/src/lib/components/AboutPage.svelte b/src/lib/components/pages/AboutPage.svelte
similarity index 98%
rename from src/lib/components/AboutPage.svelte
rename to src/lib/components/pages/AboutPage.svelte
index 93adee0..5e45d0e 100644
--- a/src/lib/components/AboutPage.svelte
+++ b/src/lib/components/pages/AboutPage.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { accordion } from '$lib/actions/accordion';
   import { reveal } from '$lib/actions/reveal';
-  import CtaCard from '$lib/components/CtaCard.svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import ServiceHero from '$lib/components/ServiceHero.svelte';
+  import CtaCard from '$lib/components/ui/CtaCard.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import type { AboutPageContent } from '$lib/types';
 
diff --git a/src/lib/components/BookingPage.svelte b/src/lib/components/pages/BookingPage.svelte
similarity index 90%
rename from src/lib/components/BookingPage.svelte
rename to src/lib/components/pages/BookingPage.svelte
index 8895bc3..374971d 100644
--- a/src/lib/components/BookingPage.svelte
+++ b/src/lib/components/pages/BookingPage.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import InfoSection from '$lib/components/InfoSection.svelte';
-  import ServiceHero from '$lib/components/ServiceHero.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import InfoSection from '$lib/components/sections/InfoSection.svelte';
+  import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
   import type { BookingContent, InfoContent } from '$lib/types';
 
   export let booking: BookingContent;
diff --git a/src/lib/components/ContractPage.svelte b/src/lib/components/pages/ContractPage.svelte
similarity index 99%
rename from src/lib/components/ContractPage.svelte
rename to src/lib/components/pages/ContractPage.svelte
index d991bc3..f7cb064 100644
--- a/src/lib/components/ContractPage.svelte
+++ b/src/lib/components/pages/ContractPage.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import OnboardingSignaturePad from '$lib/components/OnboardingSignaturePad.svelte';
-  import OnboardingAuth from '$lib/components/OnboardingAuth.svelte';
-  import OnboardingFooter from '$lib/components/OnboardingFooter.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import OnboardingSignaturePad from '$lib/components/ui/OnboardingSignaturePad.svelte';
+  import OnboardingAuth from '$lib/components/sections/OnboardingAuth.svelte';
+  import OnboardingFooter from '$lib/components/ui/OnboardingFooter.svelte';
   import logoDesktop from '$lib/images/goodwalk-auckland-dog-walking-logo.png?enhanced';
   import type { Picture } from '@sveltejs/enhanced-img';
 
diff --git a/src/lib/components/LegalPage.svelte b/src/lib/components/pages/LegalPage.svelte
similarity index 100%
rename from src/lib/components/LegalPage.svelte
rename to src/lib/components/pages/LegalPage.svelte
diff --git a/src/lib/components/LocationPage.svelte b/src/lib/components/pages/LocationPage.svelte
similarity index 99%
rename from src/lib/components/LocationPage.svelte
rename to src/lib/components/pages/LocationPage.svelte
index c079209..d751bd5 100644
--- a/src/lib/components/LocationPage.svelte
+++ b/src/lib/components/pages/LocationPage.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { sharedServices } from '$lib/content/services';
   import { reveal } from '$lib/actions/reveal';
-  import CtaCard from '$lib/components/CtaCard.svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import CtaCard from '$lib/components/ui/CtaCard.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import { getSeededTestimonialIndex } from '$lib/testimonials';
   import type { LocationPageContent, TestimonialContent } from '$lib/types';
diff --git a/src/lib/components/OnboardingPage.svelte b/src/lib/components/pages/OnboardingPage.svelte
similarity index 87%
rename from src/lib/components/OnboardingPage.svelte
rename to src/lib/components/pages/OnboardingPage.svelte
index 19b975a..5913db3 100644
--- a/src/lib/components/OnboardingPage.svelte
+++ b/src/lib/components/pages/OnboardingPage.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import OnboardingSignaturePad from '$lib/components/OnboardingSignaturePad.svelte';
-  import OnboardingAuth from '$lib/components/OnboardingAuth.svelte';
-  import OnboardingFooter from '$lib/components/OnboardingFooter.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import OnboardingSignaturePad from '$lib/components/ui/OnboardingSignaturePad.svelte';
+  import OnboardingAuth from '$lib/components/sections/OnboardingAuth.svelte';
+  import OnboardingFooter from '$lib/components/ui/OnboardingFooter.svelte';
   import logoDesktop from '$lib/images/goodwalk-auckland-dog-walking-logo.png?enhanced';
   import type { Picture } from '@sveltejs/enhanced-img';
 
@@ -11,6 +11,25 @@
 
   export const preview = false;
 
+  // Owner "view as client" impersonation. When `impersonation` is true the
+  // page renders the given client's onboarding view from injected data (no
+  // /auth/verify call) and the owner can walk through every step interactively.
+  // It still never touches the real client: client-side persistence is
+  // neutralised (saveDraft / the localStorage reactive block are no-ops) and
+  // the final submit is routed to `onImpersonationSubmit` instead of the real
+  // endpoint. Defaults keep the normal client flow intact.
+  export let impersonation = false;
+  export let impersonationData: {
+    email?: string;
+    profile?: Record<string, unknown>;
+    draft?: Record<string, unknown>;
+  } | null = null;
+  // Called on final submit while impersonating. The parent decides whether to
+  // email the run-through to a preview address or do nothing (dry run); either
+  // way the real client is never contacted or updated. Throwing surfaces an
+  // error in the form just like a real failed submit.
+  export let onImpersonationSubmit: ((payload: Record<string, unknown>) => Promise<void>) | null = null;
+
   const ownerEmail = 'info@goodwalk.co.nz';
   const ownerPhone = '(022) 642 1011';
   const services = ['Tiny Gang Pack Walks', 'Solo Walks', 'Puppy Visits', 'Unsure yet'];
@@ -56,6 +75,9 @@
   let vetPhone = '';
   let emergencyContactName = '';
   let emergencyContactPhone = '';
+  let regularFleaTickTreatment = '';
+  let petInsurance = '';
+  let petInsuranceOwnerExpenseAccepted = false;
 
   // Health & diet
   let isVaccinated = '';            // 'yes' | 'no'
@@ -75,6 +97,7 @@
   let visitsDogParks = '';
   let dogParksFrequency = '';
   let biteHistory = '';
+  let resourceGuards = '';
   let reactiveToDogs = '';
   let reactiveToAnimals = '';
   let reactiveToChildren = '';
@@ -211,6 +234,7 @@
       servicesNeeded, temperament, accessInstructions,
       vetName, vetAddress, vetPhone,
       emergencyContactName, emergencyContactPhone,
+      regularFleaTickTreatment, petInsurance, petInsuranceOwnerExpenseAccepted,
       isVaccinated,
       hasFoodAllergies, foodAllergiesDetail,
       hasEnvAllergies, envAllergiesDetail,
@@ -218,7 +242,7 @@
       onMedication, medicationDetail,
       wellSocialised, dogsInteractedWeekly,
       visitsBeach, visitsDogParks, dogParksFrequency,
-      biteHistory,
+      biteHistory, resourceGuards,
       reactiveToDogs, reactiveToAnimals, reactiveToChildren, reactiveToPeople,
       isDesexed, isRegistered, leashTrained,
       recallRating, ranAwayBefore,
@@ -229,6 +253,7 @@
   }
 
   async function saveDraft() {
+    if (impersonation) return; // read-only replica never persists drafts
     try {
       const token = window.localStorage.getItem('gw_onboarding_session');
       if (!token) return;
@@ -280,6 +305,9 @@
     vetPhone = pickString(draft, 'vetPhone', vetPhone);
     emergencyContactName = pickString(draft, 'emergencyContactName', emergencyContactName);
     emergencyContactPhone = pickString(draft, 'emergencyContactPhone', emergencyContactPhone);
+    regularFleaTickTreatment = pickString(draft, 'regularFleaTickTreatment', regularFleaTickTreatment);
+    petInsurance = pickString(draft, 'petInsurance', petInsurance);
+    petInsuranceOwnerExpenseAccepted = pickBool(draft, 'petInsuranceOwnerExpenseAccepted', petInsuranceOwnerExpenseAccepted);
     isVaccinated = pickString(draft, 'isVaccinated', isVaccinated);
     hasFoodAllergies = pickString(draft, 'hasFoodAllergies', hasFoodAllergies);
     foodAllergiesDetail = pickString(draft, 'foodAllergiesDetail', foodAllergiesDetail);
@@ -295,6 +323,7 @@
     visitsDogParks = pickString(draft, 'visitsDogParks', visitsDogParks);
     dogParksFrequency = pickString(draft, 'dogParksFrequency', dogParksFrequency);
     biteHistory = pickString(draft, 'biteHistory', biteHistory);
+    resourceGuards = pickString(draft, 'resourceGuards', resourceGuards);
     reactiveToDogs = pickString(draft, 'reactiveToDogs', reactiveToDogs);
     reactiveToAnimals = pickString(draft, 'reactiveToAnimals', reactiveToAnimals);
     reactiveToChildren = pickString(draft, 'reactiveToChildren', reactiveToChildren);
@@ -313,7 +342,7 @@
     termsAccepted = pickBool(draft, 'termsAccepted', termsAccepted);
   }
 
-  $: if (typeof window !== 'undefined') {
+  $: if (typeof window !== 'undefined' && !impersonation) {
     try {
       window.localStorage.setItem(draftStorageKey, JSON.stringify(getDraftSnapshot()));
     } catch { /* storage unavailable */ }
@@ -379,7 +408,30 @@
     userEmail = '';
   }
 
+  function initImpersonation() {
+    // Render straight from the owner-supplied snapshot. No tokens are read,
+    // no network calls are made, and no timers are started.
+    const data = impersonationData ?? {};
+    const serverEmail = typeof data.email === 'string' ? data.email : '';
+    isAuthenticated = true;
+    userEmail = serverEmail;
+    applyProfile(serverEmail, (data.profile ?? {}) as Record<string, unknown>);
+    const onboardingDraft =
+      data.draft && typeof data.draft === 'object'
+        ? (data.draft as Record<string, unknown>).onboarding
+        : null;
+    if (!onboardingCompleted && onboardingDraft && typeof onboardingDraft === 'object') {
+      applyDraft(onboardingDraft as Record<string, unknown>);
+    }
+    authChecking = false;
+  }
+
   onMount(async () => {
+    if (impersonation) {
+      initImpersonation();
+      return;
+    }
+
     await checkAuth();
 
     if (!isAuthenticated) return;
@@ -433,96 +485,12 @@
     }
   }
 
-  function validateEmail(raw: string): string {
-    const value = raw.trim();
-    if (!value) return 'Please enter your email address';
-    if (!/^[A-Za-z0-9._%+-]+@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/.test(value)) {
-      return 'Please enter a valid email address';
-    }
-    return '';
-  }
-
-  type RequirementCheck = { key: string; label: string; met: boolean; step: number };
-
-  $: contactDetailsMet =
-    Boolean(ownerFirstName.trim()) &&
-    Boolean(ownerLastName.trim()) &&
-    !validateEmail(email) &&
-    Boolean(phone.trim()) &&
-    Boolean(address.trim());
-
-  $: requirementChecks = [
-    { key: 'contact', label: 'Your contact details (name, email, phone, address)', met: contactDetailsMet, step: 1 },
-    { key: 'services', label: 'At least one service selected', met: servicesNeeded.length > 0, step: 2 },
-    { key: 'vaccination', label: 'Vaccinations confirmed', met: isVaccinated === 'yes', step: 3 },
-    { key: 'council', label: 'Council registration confirmed', met: isRegistered === 'yes', step: 4 },
-    { key: 'vetConsent', label: 'Emergency vet treatment consent', met: emergencyVetConsent, step: 5 },
-    { key: 'declaration', label: 'Onboarding declaration ticked', met: termsAccepted, step: 5 },
-    { key: 'signature', label: 'Valid signature added', met: Boolean(signatureDataUrl), step: 5 },
-  ] as RequirementCheck[];
-
-  $: requirementsAllMet = requirementChecks.every((r) => r.met);
-
-  function goToStep(step: number) {
-    if (step < 1 || step > steps.length) return;
-    errors = {};
-    currentStep = step;
-    window.scrollTo({ top: 0, behavior: 'smooth' });
-  }
-
-  function validateStep(step: number): boolean {
-    const next: Record<string, string> = {};
-
-    if (step === 1) {
-      if (!ownerFirstName.trim()) next.ownerFirstName = 'Please enter your first name';
-      if (!ownerLastName.trim()) next.ownerLastName = 'Please enter your last name';
-      const emailError = validateEmail(email);
-      if (emailError) next.email = emailError;
-      if (!phone.trim()) next.phone = 'Please enter your phone number';
-      if (!address.trim()) next.address = 'Please enter your address';
-    } else if (step === 2) {
-      if (!dogName.trim()) next.dogName = "Please enter your dog's name";
-      if (!dogBreed.trim()) next.dogBreed = "Please enter your dog's breed";
-      if (!dogDateOfBirth.trim()) next.dogDateOfBirth = "Please enter your dog's date of birth";
-      if (!servicesNeeded.length) next.servicesNeeded = 'Choose at least one service';
-    } else if (step === 3) {
-      if (!vetName.trim()) next.vetName = 'Please enter your vet clinic name';
-      if (!vetAddress.trim()) next.vetAddress = 'Please enter the vet address';
-      if (!vetPhone.trim()) next.vetPhone = 'Please enter your vet phone number';
-      if (!emergencyContactName.trim()) next.emergencyContactName = 'Please add an emergency contact';
-      if (!emergencyContactPhone.trim()) next.emergencyContactPhone = 'Please add an emergency contact number';
-      if (!isVaccinated) next.isVaccinated = 'Please answer the vaccination question';
-      if (!hasFoodAllergies) next.hasFoodAllergies = 'Please answer the food allergy question';
-      if (hasFoodAllergies === 'yes' && !foodAllergiesDetail.trim()) {
-        next.foodAllergiesDetail = 'Please describe the food allergy';
-      }
-      if (!hasEnvAllergies) next.hasEnvAllergies = 'Please answer the environmental allergy question';
-      if (hasEnvAllergies === 'yes' && !envAllergiesDetail.trim()) {
-        next.envAllergiesDetail = 'Please describe the environmental allergy';
-      }
-      if (!onSpecialDiet) next.onSpecialDiet = 'Please answer the special diet question';
-      if (onSpecialDiet === 'yes' && !specialDietDetail.trim()) {
-        next.specialDietDetail = 'Please describe the special diet';
-      }
-      if (!onMedication) next.onMedication = 'Please answer the medication question';
-      if (onMedication === 'yes' && !medicationDetail.trim()) {
-        next.medicationDetail = 'Please describe the medication';
-      }
-    } else if (step === 4) {
-      if (!isRegistered) next.isRegistered = 'Please confirm whether your dog is registered with council';
-    } else if (step === 5) {
-      if (!emergencyVetConsent) next.emergencyVetConsent = 'Please confirm emergency treatment consent';
-      if (!termsAccepted) next.termsAccepted = 'Please confirm the onboarding declaration';
-      if (!signatureDataUrl) next.signature = 'Please add your signature before sending';
-    }
-
-    errors = next;
-    return Object.keys(next).length === 0;
-  }
+  // The form is intentionally free-fill: no fields are required and it can be
+  // submitted incomplete. Owners often onboard before they've named a dog or
+  // sorted council registration, and we follow up on the gaps ourselves.
 
   function nextStep() {
     noteInteraction();
-    if (!validateStep(currentStep)) return;
     currentStep = Math.min(currentStep + 1, steps.length);
     void saveDraft();
     window.scrollTo({ top: 0, behavior: 'smooth' });
@@ -547,6 +515,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
             { label: 'Email', value: fieldValue(email) },
             { label: 'Contact Number', value: fieldValue(phone) },
             { label: 'Home Address', value: fieldValue(address) },
+            { label: 'Home Access Instructions', value: fieldValue(accessInstructions) },
           ],
         },
         {
@@ -570,7 +539,9 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
             { label: 'Vet Address', value: fieldValue(vetAddress) },
             { label: 'Emergency Contact Name', value: fieldValue(emergencyContactName) },
             { label: 'Emergency Contact Number', value: fieldValue(emergencyContactPhone) },
-            { label: 'Home Access Instructions', value: fieldValue(accessInstructions) },
+            { label: 'Regular Flea and Tick Treatment?', value: yesNoText(regularFleaTickTreatment) },
+            { label: 'Pet Insurance?', value: yesNoText(petInsurance) },
+            { label: 'Owner Covers All Vet Costs if Uninsured', value: petInsurance === 'no' ? yesNoText(petInsuranceOwnerExpenseAccepted) : '—' },
             { label: 'Are Vaccinations Current?', value: yesNoText(isVaccinated) },
             { label: 'Any Food Allergies?', value: hasFoodAllergies === 'yes' ? fieldValue(foodAllergiesDetail) : yesNoText(hasFoodAllergies) },
             { label: 'Any Environmental Allergies?', value: hasEnvAllergies === 'yes' ? fieldValue(envAllergiesDetail) : yesNoText(hasEnvAllergies) },
@@ -587,6 +558,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
             { label: 'Visits the Beach?', value: yesNoText(visitsBeach) },
             { label: 'Visits Dog Parks Frequently?', value: visitsDogParks === 'yes' ? fieldValue(dogParksFrequency ? `${dogParksFrequency} per week` : 'Yes') : yesNoText(visitsDogParks) },
             { label: 'Any Bite History?', value: yesNoText(biteHistory) },
+            { label: 'Resource Guards?', value: yesNoText(resourceGuards) },
             { label: 'Reactive to Other Dogs?', value: yesNoText(reactiveToDogs) },
             { label: 'Reactive to Other Animals?', value: yesNoText(reactiveToAnimals) },
             { label: 'Reactive to Children?', value: yesNoText(reactiveToChildren) },
@@ -621,15 +593,6 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
     sendClickedAt = Date.now();
     submitError = '';
 
-    if (!validateStep(5)) return;
-
-    const firstUnmet = requirementChecks.find((r) => !r.met);
-    if (firstUnmet) {
-      submitError = `Please complete: ${firstUnmet.label}.`;
-      if (firstUnmet.step !== currentStep) goToStep(firstUnmet.step);
-      return;
-    }
-
     submitting = true;
 
     const controller = new AbortController();
@@ -648,30 +611,46 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
         toStr(additionalNotes).trim(),
       ].filter(Boolean).join('\n');
 
+      const payload = {
+        ...getDraftSnapshot(),
+        fullName,
+        dogAge: dogDateOfBirth,
+        medicalNotes,
+        regularFleaTickTreatment,
+        petInsurance,
+        petInsuranceOwnerExpenseAccepted,
+        councilRegistrationConfirmed: isRegistered === 'yes',
+        vaccinationsConfirmed: isVaccinated === 'yes',
+        signatureDataUrl,
+        signedOnDate,
+        submissionSnapshot,
+        website,
+        formStartedAt, visitStartedAt, pageEnteredAt, firstInteractionAt, sendClickedAt,
+        referrer: document.referrer,
+        page: window.location.href,
+      };
+
+      if (impersonation) {
+        // Owner run-through: hand off to the parent (preview email or dry run).
+        // Never hits the real client endpoint or the owner's own saved draft.
+        if (onImpersonationSubmit) await onImpersonationSubmit(payload);
+        onboardingCompleted = true;
+        onboardingSummary = submissionSnapshot;
+        onboardingSubmittedAt = signedOnDate;
+        window.scrollTo({ top: 0, behavior: 'smooth' });
+        return;
+      }
+
       const response = await fetch('/api/onboarding-submit', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         signal: controller.signal,
-        body: JSON.stringify({
-          ...getDraftSnapshot(),
-          fullName,
-          dogAge: dogDateOfBirth,
-          medicalNotes,
-          councilRegistrationConfirmed: isRegistered === 'yes',
-          vaccinationsConfirmed: isVaccinated === 'yes',
-          signatureDataUrl,
-          signedOnDate,
-          submissionSnapshot,
-          website,
-          formStartedAt, visitStartedAt, pageEnteredAt, firstInteractionAt, sendClickedAt,
-          referrer: document.referrer,
-          page: window.location.href,
-        })
+        body: JSON.stringify(payload)
       });
 
       if (!response.ok) {
-        const payload = await response.json().catch(() => null);
-        throw new Error(payload?.detail?.message ?? payload?.detail ?? payload?.error ?? `Submission failed (${response.status})`);
+        const errorPayload = await response.json().catch(() => null);
+        throw new Error(errorPayload?.detail?.message ?? errorPayload?.detail ?? errorPayload?.error ?? `Submission failed (${response.status})`);
       }
 
       onboardingCompleted = true;
@@ -970,6 +949,16 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
                   <input bind:value={address} on:input={noteInteraction} autocomplete="street-address" placeholder="Street, suburb, city" />
                   {#if errors.address}<small>{errors.address}</small>{/if}
                 </label>
+
+                <label class="field field-full">
+                  <span>Home access instructions</span>
+                  <textarea
+                    bind:value={accessInstructions}
+                    rows="3"
+                    placeholder="Keys, gate code, where to collect your dog, alarm notes."
+                    on:input={noteInteraction}
+                  ></textarea>
+                </label>
               </div>
 
               <div class="panel-nav">
@@ -1125,19 +1114,33 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
                   <div class="panel-subsection-icon"><Icon name="fas fa-notes-medical" /></div>
                   <div>
                     <h3>Health notes</h3>
-                    <p>Day-to-day care, access, and anything we should know. Vaccination status is required below.</p>
+                    <p>Day-to-day care and anything we should know. Vaccination status is required below.</p>
                   </div>
                 </div>
 
-                <label class="field">
-                  <span>Home access instructions</span>
-                  <textarea
-                    bind:value={accessInstructions}
-                    rows="3"
-                    placeholder="Keys, gate code, where to collect your dog, alarm notes."
-                    on:input={noteInteraction}
-                  ></textarea>
-                </label>
+                {@render yesNo('Does your dog get regular flea and tick treatment?', 'regularFleaTickTreatment', regularFleaTickTreatment, (v) => (regularFleaTickTreatment = v))}
+
+                {@render yesNo('Does your dog have pet insurance?', 'petInsurance', petInsurance, (v) => {
+                  petInsurance = v;
+                  if (v !== 'no') {
+                    petInsuranceOwnerExpenseAccepted = false;
+                    if (errors.petInsuranceOwnerExpenseAccepted) {
+                      errors = { ...errors, petInsuranceOwnerExpenseAccepted: '' };
+                    }
+                  }
+                })}
+                {#if petInsurance === 'no'}
+                  <label class="confirm-row">
+                    <input bind:checked={petInsuranceOwnerExpenseAccepted} type="checkbox" on:change={() => {
+                      noteInteraction();
+                      if (errors.petInsuranceOwnerExpenseAccepted) {
+                        errors = { ...errors, petInsuranceOwnerExpenseAccepted: '' };
+                      }
+                    }} />
+                    <span>If my dog does not have pet insurance, I agree that Goodwalk takes no responsibility and all vet costs are incurred at the owner's expense.</span>
+                  </label>
+                  {#if errors.petInsuranceOwnerExpenseAccepted}<small>{errors.petInsuranceOwnerExpenseAccepted}</small>{/if}
+                {/if}
 
                 {@render yesNo("Are your dog's vaccinations up to date?", 'isVaccinated', isVaccinated, (v) => (isVaccinated = v))}
 
@@ -1218,6 +1221,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
               {/if}
 
               {@render yesNo('Any bite history?', 'biteHistory', biteHistory, (v) => (biteHistory = v))}
+              {@render yesNo('Does your dog resource guard?', 'resourceGuards', resourceGuards, (v) => (resourceGuards = v))}
               {@render yesNo('Reactive to other dogs?', 'reactiveToDogs', reactiveToDogs, (v) => (reactiveToDogs = v))}
               {@render yesNo('Reactive to other animals?', 'reactiveToAnimals', reactiveToAnimals, (v) => (reactiveToAnimals = v))}
               {@render yesNo('Reactive to children?', 'reactiveToChildren', reactiveToChildren, (v) => (reactiveToChildren = v))}
@@ -1300,41 +1304,6 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
                 </div>
               </div>
 
-              <div class="requirements-panel" class:requirements-complete={requirementsAllMet} aria-label="Onboarding requirements">
-                <div class="requirements-head">
-                  <h3>Before you send</h3>
-                  <p>
-                    {#if requirementsAllMet}
-                      All set. You're ready to sign and send.
-                    {:else}
-                      We need each of these before you submit. Tap any item to jump back to that step.
-                    {/if}
-                  </p>
-                </div>
-                <ul class="requirements-list">
-                  {#each requirementChecks as req (req.key)}
-                    <li class="requirement-row" class:requirement-met={req.met}>
-                      <button
-                        type="button"
-                        class="requirement-button"
-                        on:click={() => goToStep(req.step)}
-                        aria-label="{req.met ? 'Met' : 'Not met'}: {req.label}. Go to step {req.step}."
-                      >
-                        <span class="requirement-status" aria-hidden="true">
-                          {#if req.met}
-                            <Icon name="fas fa-circle-check" />
-                          {:else}
-                            <Icon name="fas fa-circle" />
-                          {/if}
-                        </span>
-                        <span class="requirement-label">{req.label}</span>
-                        <span class="requirement-step">Step {req.step}</span>
-                      </button>
-                    </li>
-                  {/each}
-                </ul>
-              </div>
-
               <label class="field">
                 <span>Anything else we should know?</span>
                 <textarea
@@ -1347,7 +1316,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
 
               <div class="onboarding-fields two-up">
                 <label class="field">
-                  <span>Instagram or social handle <span class="field-hint">Optional</span></span>
+                  <span>Instagram or social handle</span>
                   <input
                     bind:value={socialMediaAccount}
                     on:input={() => {
@@ -1415,7 +1384,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
                   <Icon name="fas fa-arrow-left" /> Back
                 </button>
                 <div class="panel-nav-submit-group">
-                  <button class="btn btn-yellow onboarding-submit" type="submit" disabled={submitting || !requirementsAllMet}>
+                  <button class="btn btn-yellow onboarding-submit" type="submit" disabled={submitting}>
                     {#if submitting}Sending…{:else}Send onboarding form{/if}
                   </button>
                   <p>This goes directly to Aless for review.</p>
@@ -2356,157 +2325,6 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
     transform: translateY(-1px);
   }
 
-  /* ── Requirements summary (step 5) ── */
-  .requirements-panel {
-    margin: 4px 0 28px;
-    padding: 22px 22px 18px;
-    border-radius: 24px;
-    background: linear-gradient(180deg, #fffefb 0%, #faf8f1 100%);
-    border: 1px solid rgba(33, 48, 33, 0.12);
-    box-shadow:
-      inset 0 0 0 1px rgba(255, 255, 255, 0.5),
-      0 8px 20px rgba(17, 20, 24, 0.04);
-    transition: border-color 0.25s ease, box-shadow 0.25s ease, background 0.25s ease;
-  }
-
-  .requirements-panel.requirements-complete {
-    border-color: rgba(33, 48, 33, 0.22);
-    background: linear-gradient(180deg, #fffbe8 0%, #fff5c9 100%);
-    box-shadow:
-      inset 0 0 0 1px rgba(255, 255, 255, 0.6),
-      0 10px 26px rgba(255, 209, 0, 0.18);
-  }
-
-  .requirements-head {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    gap: 12px;
-    margin-bottom: 14px;
-  }
-
-  .requirements-head h3 {
-    margin: 0;
-    font-family: var(--font-head);
-    font-size: 17px;
-    font-weight: 700;
-    letter-spacing: -0.02em;
-    color: var(--gw-green);
-  }
-
-  .requirements-head p {
-    margin: 0;
-    max-width: 56ch;
-    font-size: 12px;
-    font-weight: 700;
-    line-height: 1.5;
-    letter-spacing: 0.005em;
-    color: rgba(33, 48, 33, 0.62);
-  }
-
-  .requirements-list {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    display: grid;
-    gap: 8px;
-  }
-
-  .requirement-button {
-    width: 100%;
-    display: grid;
-    grid-template-columns: 24px 1fr auto;
-    gap: 14px;
-    align-items: center;
-    padding: 12px 14px;
-    border-radius: 14px;
-    border: 1px solid rgba(33, 48, 33, 0.1);
-    background: rgba(255, 255, 255, 0.85);
-    color: var(--gw-green);
-    font-family: var(--font-body);
-    font-size: 14px;
-    font-weight: 700;
-    text-align: left;
-    cursor: pointer;
-    transition:
-      background 0.18s ease,
-      border-color 0.18s ease,
-      transform 0.18s cubic-bezier(0.22, 1, 0.36, 1),
-      box-shadow 0.18s ease;
-  }
-
-  .requirement-button:hover {
-    border-color: rgba(33, 48, 33, 0.3);
-    background: #fff;
-    transform: translateY(-1px);
-    box-shadow: 0 6px 14px rgba(17, 20, 24, 0.05);
-  }
-
-  .requirement-button:focus-visible {
-    outline: none;
-    border-color: var(--gw-green);
-    box-shadow: 0 0 0 4px rgba(255, 209, 0, 0.32);
-  }
-
-  .requirement-status {
-    display: inline-flex;
-    width: 24px;
-    height: 24px;
-    align-items: center;
-    justify-content: center;
-    color: rgba(33, 48, 33, 0.3);
-    font-size: 20px;
-  }
-
-  .requirement-met .requirement-status {
-    color: #2f7a3a;
-  }
-
-  .requirement-met .requirement-button {
-    background: rgba(47, 122, 58, 0.07);
-    border-color: rgba(47, 122, 58, 0.28);
-  }
-
-  .requirement-label {
-    line-height: 1.4;
-    color: #171b20;
-  }
-
-  .requirement-met .requirement-label {
-    color: var(--gw-green);
-  }
-
-  .requirement-step {
-    font-family: var(--font-head);
-    font-size: 11px;
-    font-weight: 700;
-    letter-spacing: 0.08em;
-    text-transform: uppercase;
-    color: rgba(33, 48, 33, 0.5);
-  }
-
-  .requirement-met .requirement-step {
-    color: rgba(47, 122, 58, 0.7);
-  }
-
-  @media (max-width: 540px) {
-    .requirements-head {
-      flex-direction: column;
-      align-items: flex-start;
-      gap: 6px;
-    }
-
-    .requirement-button {
-      grid-template-columns: 22px 1fr;
-      grid-template-rows: auto auto;
-      row-gap: 4px;
-    }
-
-    .requirement-step {
-      grid-column: 2;
-    }
-  }
-
   /* ── Declaration ── */
   .onboarding-confirm-list {
     display: grid;
@@ -2730,7 +2548,6 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
   @media (prefers-reduced-motion: reduce) {
     .field input,
     .field textarea,
-    .requirement-button,
     .panel-nav-back,
     .panel-nav-next,
     .onboarding-submit,
@@ -2744,8 +2561,7 @@ function buildSubmissionSnapshot(submittedAt: string): SubmissionSummary {
 
     .panel-nav-back:hover,
     .panel-nav-next:hover,
-    .onboarding-submit:not(:disabled):hover,
-    .requirement-button:hover {
+    .onboarding-submit:not(:disabled):hover {
       transform: none;
     }
   }
diff --git a/src/lib/components/OnboardingPage.test.ts b/src/lib/components/pages/OnboardingPage.test.ts
similarity index 100%
rename from src/lib/components/OnboardingPage.test.ts
rename to src/lib/components/pages/OnboardingPage.test.ts
diff --git a/src/lib/components/PricingPage.svelte b/src/lib/components/pages/PricingPage.svelte
similarity index 98%
rename from src/lib/components/PricingPage.svelte
rename to src/lib/components/pages/PricingPage.svelte
index ec1eb0b..541f391 100644
--- a/src/lib/components/PricingPage.svelte
+++ b/src/lib/components/pages/PricingPage.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { reveal } from '$lib/actions/reveal';
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import PricingPlanCard from '$lib/components/PricingPlanCard.svelte';
-  import ServiceHero from '$lib/components/ServiceHero.svelte';
-  import TestimonialsSection from '$lib/components/TestimonialsSection.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import PricingPlanCard from '$lib/components/ui/PricingPlanCard.svelte';
+  import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
+  import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
   import { decoratePlans } from '$lib/utils/pricing';
   import type { PricingPageContent, SiteSharedContent } from '$lib/types';
 
diff --git a/src/lib/components/ServiceLandingPage.svelte b/src/lib/components/pages/ServiceLandingPage.svelte
similarity index 99%
rename from src/lib/components/ServiceLandingPage.svelte
rename to src/lib/components/pages/ServiceLandingPage.svelte
index c7f67c4..7415b41 100644
--- a/src/lib/components/ServiceLandingPage.svelte
+++ b/src/lib/components/pages/ServiceLandingPage.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import { onMount, tick } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { reveal } from '$lib/actions/reveal';
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import PricingPlanCard from '$lib/components/PricingPlanCard.svelte';
-  import ServiceHero from '$lib/components/ServiceHero.svelte';
-  import TestimonialsSection from '$lib/components/TestimonialsSection.svelte';
-  import FaqSection from '$lib/components/FaqSection.svelte';
-  import ServiceAreaMap from '$lib/components/ServiceAreaMap.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import PricingPlanCard from '$lib/components/ui/PricingPlanCard.svelte';
+  import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
+  import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
+  import FaqSection from '$lib/components/sections/FaqSection.svelte';
+  import ServiceAreaMap from '$lib/components/sections/ServiceAreaMap.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import { decoratePlans } from '$lib/utils/pricing';
   import { locationPages } from '$lib/content/locations';
diff --git a/src/lib/components/TestimonialsPage.svelte b/src/lib/components/pages/TestimonialsPage.svelte
similarity index 98%
rename from src/lib/components/TestimonialsPage.svelte
rename to src/lib/components/pages/TestimonialsPage.svelte
index 90a3a9f..825c2c0 100644
--- a/src/lib/components/TestimonialsPage.svelte
+++ b/src/lib/components/pages/TestimonialsPage.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import { reveal } from '$lib/actions/reveal';
-  import ServiceHero from '$lib/components/ServiceHero.svelte';
+  import ServiceHero from '$lib/components/sections/ServiceHero.svelte';
   import type { SiteSharedContent, TestimonialContent } from '$lib/types';
 
   export let content: SiteSharedContent;
diff --git a/src/lib/components/BookingSection.svelte b/src/lib/components/sections/BookingSection.svelte
similarity index 99%
rename from src/lib/components/BookingSection.svelte
rename to src/lib/components/sections/BookingSection.svelte
index 123db2c..5b57153 100644
--- a/src/lib/components/BookingSection.svelte
+++ b/src/lib/components/sections/BookingSection.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { reveal } from '$lib/actions/reveal';
   import type { BookingContent } from '$lib/types';
-  type SuccessModalComponentType = typeof import('$lib/components/SuccessModal.svelte').default;
-  type ErrorModalComponentType = typeof import('$lib/components/ErrorModal.svelte').default;
+  type SuccessModalComponentType = typeof import('$lib/components/ui/SuccessModal.svelte').default;
+  type ErrorModalComponentType = typeof import('$lib/components/ui/ErrorModal.svelte').default;
 
   export let booking: BookingContent;
   export let allowGeneralEnquiry = false;
@@ -87,12 +87,12 @@
 
   async function ensureSuccessModal() {
     if (SuccessModalComponent) return;
-    SuccessModalComponent = (await import('$lib/components/SuccessModal.svelte')).default;
+    SuccessModalComponent = (await import('$lib/components/ui/SuccessModal.svelte')).default;
   }
 
   async function ensureErrorModal() {
     if (ErrorModalComponent) return;
-    ErrorModalComponent = (await import('$lib/components/ErrorModal.svelte')).default;
+    ErrorModalComponent = (await import('$lib/components/ui/ErrorModal.svelte')).default;
   }
 
   function validateEmail(raw: string): string {
diff --git a/src/lib/components/BookingSection.test.ts b/src/lib/components/sections/BookingSection.test.ts
similarity index 100%
rename from src/lib/components/BookingSection.test.ts
rename to src/lib/components/sections/BookingSection.test.ts
diff --git a/src/lib/components/BookingWizard.svelte b/src/lib/components/sections/BookingWizard.svelte
similarity index 99%
rename from src/lib/components/BookingWizard.svelte
rename to src/lib/components/sections/BookingWizard.svelte
index d7e8551..6b3c97c 100644
--- a/src/lib/components/BookingWizard.svelte
+++ b/src/lib/components/sections/BookingWizard.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { fade } from 'svelte/transition';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { reveal } from '$lib/actions/reveal';
   import type { BookingContent } from '$lib/types';
   import { promoteJourney, trackEvent } from '$lib/analytics';
   import { trackAb, type AbContext } from '$lib/ab';
 
-  type SuccessModalComponentType = typeof import('$lib/components/SuccessModal.svelte').default;
-  type ErrorModalComponentType = typeof import('$lib/components/ErrorModal.svelte').default;
+  type SuccessModalComponentType = typeof import('$lib/components/ui/SuccessModal.svelte').default;
+  type ErrorModalComponentType = typeof import('$lib/components/ui/ErrorModal.svelte').default;
 
   export let booking: BookingContent;
   export let pagePath = '';
@@ -156,12 +156,12 @@
 
   async function ensureSuccessModal() {
     if (SuccessModalComponent) return;
-    SuccessModalComponent = (await import('$lib/components/SuccessModal.svelte')).default;
+    SuccessModalComponent = (await import('$lib/components/ui/SuccessModal.svelte')).default;
   }
 
   async function ensureErrorModal() {
     if (ErrorModalComponent) return;
-    ErrorModalComponent = (await import('$lib/components/ErrorModal.svelte')).default;
+    ErrorModalComponent = (await import('$lib/components/ui/ErrorModal.svelte')).default;
   }
 
   function noteInteraction() {
diff --git a/src/lib/components/FaqSection.svelte b/src/lib/components/sections/FaqSection.svelte
similarity index 97%
rename from src/lib/components/FaqSection.svelte
rename to src/lib/components/sections/FaqSection.svelte
index 9bead66..63a3974 100644
--- a/src/lib/components/FaqSection.svelte
+++ b/src/lib/components/sections/FaqSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { accordion } from '$lib/actions/accordion';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { FaqItem } from '$lib/types';
 
   export let title = 'FAQs';
diff --git a/src/lib/components/FounderStorySection.svelte b/src/lib/components/sections/FounderStorySection.svelte
similarity index 99%
rename from src/lib/components/FounderStorySection.svelte
rename to src/lib/components/sections/FounderStorySection.svelte
index 076c802..bc33164 100644
--- a/src/lib/components/FounderStorySection.svelte
+++ b/src/lib/components/sections/FounderStorySection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { reveal } from '$lib/actions/reveal';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import type { FounderStoryContent } from '$lib/types';
 
diff --git a/src/lib/components/HeroSection.svelte b/src/lib/components/sections/HeroSection.svelte
similarity index 99%
rename from src/lib/components/HeroSection.svelte
rename to src/lib/components/sections/HeroSection.svelte
index 46d8a3c..ffbfd9c 100644
--- a/src/lib/components/HeroSection.svelte
+++ b/src/lib/components/sections/HeroSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { CallToAction, HeroContent } from '$lib/types';
   import { trackAb, type AbContext } from '$lib/ab';
 
diff --git a/src/lib/components/HowItWorksSection.svelte b/src/lib/components/sections/HowItWorksSection.svelte
similarity index 99%
rename from src/lib/components/HowItWorksSection.svelte
rename to src/lib/components/sections/HowItWorksSection.svelte
index 867e958..cecef0e 100644
--- a/src/lib/components/HowItWorksSection.svelte
+++ b/src/lib/components/sections/HowItWorksSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { reveal } from '$lib/actions/reveal';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { HowItWorksContent } from '$lib/types';
 
   export let content: HowItWorksContent;
diff --git a/src/lib/components/InfoSection.svelte b/src/lib/components/sections/InfoSection.svelte
similarity index 97%
rename from src/lib/components/InfoSection.svelte
rename to src/lib/components/sections/InfoSection.svelte
index fbdf14f..bf5bd3d 100644
--- a/src/lib/components/InfoSection.svelte
+++ b/src/lib/components/sections/InfoSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
-  import FaqSection from '$lib/components/FaqSection.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import FaqSection from '$lib/components/sections/FaqSection.svelte';
   import { locationPages } from '$lib/content/locations';
   import type { InfoContent } from '$lib/types';
 
diff --git a/src/lib/components/InstagramSection.svelte b/src/lib/components/sections/InstagramSection.svelte
similarity index 99%
rename from src/lib/components/InstagramSection.svelte
rename to src/lib/components/sections/InstagramSection.svelte
index 055cd82..a02a70e 100644
--- a/src/lib/components/InstagramSection.svelte
+++ b/src/lib/components/sections/InstagramSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { HomePageContent } from '$lib/types';
 
   export let instagram: HomePageContent['instagram'];
diff --git a/src/lib/components/IntroStrip.svelte b/src/lib/components/sections/IntroStrip.svelte
similarity index 97%
rename from src/lib/components/IntroStrip.svelte
rename to src/lib/components/sections/IntroStrip.svelte
index 59cf7fa..3c0dced 100644
--- a/src/lib/components/IntroStrip.svelte
+++ b/src/lib/components/sections/IntroStrip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { IntroContent } from '$lib/types';
 
   export let intro: IntroContent;
diff --git a/src/lib/components/OnboardingAuth.svelte b/src/lib/components/sections/OnboardingAuth.svelte
similarity index 95%
rename from src/lib/components/OnboardingAuth.svelte
rename to src/lib/components/sections/OnboardingAuth.svelte
index d5135e8..04d11a7 100644
--- a/src/lib/components/OnboardingAuth.svelte
+++ b/src/lib/components/sections/OnboardingAuth.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   export let context: 'onboarding' | 'contract' | 'owner' = 'onboarding';
   $: introText =
@@ -8,7 +8,7 @@
       ? "Enter the email address you used when enquiring with Goodwalk. We'll send you a one-time code to continue your contract."
       : "Enter the email address you used when enquiring with Goodwalk. We'll send you a one-time code to continue your onboarding.";
 
-  const dispatch = createEventDispatcher<{ authenticated: { email: string; profile: Record<string, unknown>; draft: Record<string, unknown>; cpAdmin?: boolean; ownerEmail?: string } }>();
+  const dispatch = createEventDispatcher<{ authenticated: { email: string; profile: Record<string, unknown>; draft: Record<string, unknown>; cpAdmin?: boolean; ownerEmail?: string; previewEmails?: string[] } }>();
 
   const ownerEmail = 'info@goodwalk.co.nz';
   const ownerPhone = '(022) 642 1011';
@@ -58,6 +58,7 @@
       let draft: Record<string, unknown> = {};
       let cpAdmin = false;
       let verifiedOwnerEmail = '';
+      let previewEmails: string[] = [];
       try {
         const verifyRes = await fetch('/api/auth/verify', {
           headers: { Authorization: `Bearer ${data.token}` },
@@ -68,9 +69,10 @@
           draft = verifyData.draft ?? {};
           cpAdmin = Boolean(verifyData.cpAdmin);
           verifiedOwnerEmail = typeof verifyData.ownerEmail === 'string' ? verifyData.ownerEmail : '';
+          previewEmails = Array.isArray(verifyData.previewEmails) ? verifyData.previewEmails.filter((value: unknown): value is string => typeof value === 'string') : [];
         }
       } catch { /* ignore */ }
-      dispatch('authenticated', { email: data.email, profile, draft, cpAdmin, ownerEmail: verifiedOwnerEmail });
+      dispatch('authenticated', { email: data.email, profile, draft, cpAdmin, ownerEmail: verifiedOwnerEmail, previewEmails });
     } catch (e) {
       error = e instanceof Error ? e.message : 'Something went wrong';
     } finally {
diff --git a/src/lib/components/ServiceAreaMap.svelte b/src/lib/components/sections/ServiceAreaMap.svelte
similarity index 100%
rename from src/lib/components/ServiceAreaMap.svelte
rename to src/lib/components/sections/ServiceAreaMap.svelte
diff --git a/src/lib/components/ServiceHero.svelte b/src/lib/components/sections/ServiceHero.svelte
similarity index 99%
rename from src/lib/components/ServiceHero.svelte
rename to src/lib/components/sections/ServiceHero.svelte
index 164d11d..2c480c0 100644
--- a/src/lib/components/ServiceHero.svelte
+++ b/src/lib/components/sections/ServiceHero.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import type { CallToAction, HeroChip } from '$lib/types';
 
diff --git a/src/lib/components/ServicesSection.svelte b/src/lib/components/sections/ServicesSection.svelte
similarity index 99%
rename from src/lib/components/ServicesSection.svelte
rename to src/lib/components/sections/ServicesSection.svelte
index 81535a0..4e16ce1 100644
--- a/src/lib/components/ServicesSection.svelte
+++ b/src/lib/components/sections/ServicesSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { reveal } from '$lib/actions/reveal';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { IconCard } from '$lib/types';
 
   export let services: IconCard[];
diff --git a/src/lib/components/TestimonialsSection.svelte b/src/lib/components/sections/TestimonialsSection.svelte
similarity index 99%
rename from src/lib/components/TestimonialsSection.svelte
rename to src/lib/components/sections/TestimonialsSection.svelte
index 4bb4163..4455189 100644
--- a/src/lib/components/TestimonialsSection.svelte
+++ b/src/lib/components/sections/TestimonialsSection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount, tick } from 'svelte';
   import { reveal } from '$lib/actions/reveal';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { getEnhancedImage } from '$lib/enhanced-images';
   import { getSeededTestimonialIndex } from '$lib/testimonials';
   import type { TestimonialContent } from '$lib/types';
diff --git a/src/lib/components/TestimonialsSection.test.ts b/src/lib/components/sections/TestimonialsSection.test.ts
similarity index 100%
rename from src/lib/components/TestimonialsSection.test.ts
rename to src/lib/components/sections/TestimonialsSection.test.ts
diff --git a/src/lib/components/ValuesSection.svelte b/src/lib/components/sections/ValuesSection.svelte
similarity index 99%
rename from src/lib/components/ValuesSection.svelte
rename to src/lib/components/sections/ValuesSection.svelte
index c527abf..5294d85 100644
--- a/src/lib/components/ValuesSection.svelte
+++ b/src/lib/components/sections/ValuesSection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { reveal } from '$lib/actions/reveal';
   import { getEnhancedImage } from '$lib/enhanced-images';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { IconCard } from '$lib/types';
 
   export let values: IconCard[];
diff --git a/src/lib/components/CtaCard.svelte b/src/lib/components/ui/CtaCard.svelte
similarity index 98%
rename from src/lib/components/CtaCard.svelte
rename to src/lib/components/ui/CtaCard.svelte
index 544cf79..fd41e24 100644
--- a/src/lib/components/CtaCard.svelte
+++ b/src/lib/components/ui/CtaCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   export let eyebrow = 'Get in touch';
   export let title: string;
diff --git a/src/lib/components/ErrorModal.svelte b/src/lib/components/ui/ErrorModal.svelte
similarity index 98%
rename from src/lib/components/ErrorModal.svelte
rename to src/lib/components/ui/ErrorModal.svelte
index db749e1..46fc38b 100644
--- a/src/lib/components/ErrorModal.svelte
+++ b/src/lib/components/ui/ErrorModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ModalShell from '$lib/components/ModalShell.svelte';
+  import ModalShell from '$lib/components/ui/ModalShell.svelte';
 
   export let email = 'info@goodwalk.co.nz';
   export let enquiryType: 'booking' | 'general' = 'booking';
diff --git a/src/lib/components/Footer.svelte b/src/lib/components/ui/Footer.svelte
similarity index 98%
rename from src/lib/components/Footer.svelte
rename to src/lib/components/ui/Footer.svelte
index 2ce4eb5..77a8e25 100644
--- a/src/lib/components/Footer.svelte
+++ b/src/lib/components/ui/Footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { FooterContent, LinkItem } from '$lib/types';
   import { locationPages } from '$lib/content/locations';
 
diff --git a/src/lib/components/Footer.test.ts b/src/lib/components/ui/Footer.test.ts
similarity index 100%
rename from src/lib/components/Footer.test.ts
rename to src/lib/components/ui/Footer.test.ts
diff --git a/src/lib/components/Header.svelte b/src/lib/components/ui/Header.svelte
similarity index 99%
rename from src/lib/components/Header.svelte
rename to src/lib/components/ui/Header.svelte
index 60aec25..c640427 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/ui/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from '$app/stores';
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import type { NavigationContent } from '$lib/types';
   import type { Picture } from '@sveltejs/enhanced-img';
   import logoDesktop from '$lib/images/goodwalk-auckland-dog-walking-logo.png?enhanced';
diff --git a/src/lib/components/Header.test.ts b/src/lib/components/ui/Header.test.ts
similarity index 97%
rename from src/lib/components/Header.test.ts
rename to src/lib/components/ui/Header.test.ts
index 7b317b0..b071483 100644
--- a/src/lib/components/Header.test.ts
+++ b/src/lib/components/ui/Header.test.ts
@@ -2,7 +2,7 @@ import { fireEvent, render } from '@testing-library/svelte';
 import { describe, expect, it } from 'vitest';
 import Header from './Header.svelte';
 import { homepageContent } from '$lib/content/homepage';
-import { setMockPage } from '../../test/mocks/app-stores';
+import { setMockPage } from '../../../test/mocks/app-stores';
 
 describe('Header', () => {
   it('marks the services link active for service detail pages', () => {
diff --git a/src/lib/components/Icon.svelte b/src/lib/components/ui/Icon.svelte
similarity index 100%
rename from src/lib/components/Icon.svelte
rename to src/lib/components/ui/Icon.svelte
diff --git a/src/lib/components/MobileBookBar.svelte b/src/lib/components/ui/MobileBookBar.svelte
similarity index 99%
rename from src/lib/components/MobileBookBar.svelte
rename to src/lib/components/ui/MobileBookBar.svelte
index 8d46c89..885d055 100644
--- a/src/lib/components/MobileBookBar.svelte
+++ b/src/lib/components/ui/MobileBookBar.svelte
@@ -2,7 +2,7 @@
   import { onMount, tick } from 'svelte';
   import { afterNavigate } from '$app/navigation';
   import { page } from '$app/stores';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { isMobileCtaButtonEnabled } from '$lib/feature-flags';
 
   /*
diff --git a/src/lib/components/ModalShell.svelte b/src/lib/components/ui/ModalShell.svelte
similarity index 100%
rename from src/lib/components/ModalShell.svelte
rename to src/lib/components/ui/ModalShell.svelte
diff --git a/src/lib/components/OnboardingFooter.svelte b/src/lib/components/ui/OnboardingFooter.svelte
similarity index 98%
rename from src/lib/components/OnboardingFooter.svelte
rename to src/lib/components/ui/OnboardingFooter.svelte
index 7b18fbe..71cd5fe 100644
--- a/src/lib/components/OnboardingFooter.svelte
+++ b/src/lib/components/ui/OnboardingFooter.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   export let email = '';
 
diff --git a/src/lib/components/OnboardingSignaturePad.svelte b/src/lib/components/ui/OnboardingSignaturePad.svelte
similarity index 100%
rename from src/lib/components/OnboardingSignaturePad.svelte
rename to src/lib/components/ui/OnboardingSignaturePad.svelte
diff --git a/src/lib/components/PageHeader.svelte b/src/lib/components/ui/PageHeader.svelte
similarity index 100%
rename from src/lib/components/PageHeader.svelte
rename to src/lib/components/ui/PageHeader.svelte
diff --git a/src/lib/components/PricingPlanCard.svelte b/src/lib/components/ui/PricingPlanCard.svelte
similarity index 99%
rename from src/lib/components/PricingPlanCard.svelte
rename to src/lib/components/ui/PricingPlanCard.svelte
index 37bc0c8..f3cb8bd 100644
--- a/src/lib/components/PricingPlanCard.svelte
+++ b/src/lib/components/ui/PricingPlanCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   export let plan: {
     title: string;
diff --git a/src/lib/components/RouteSkeleton.svelte b/src/lib/components/ui/RouteSkeleton.svelte
similarity index 100%
rename from src/lib/components/RouteSkeleton.svelte
rename to src/lib/components/ui/RouteSkeleton.svelte
diff --git a/src/lib/components/SeoHead.svelte b/src/lib/components/ui/SeoHead.svelte
similarity index 100%
rename from src/lib/components/SeoHead.svelte
rename to src/lib/components/ui/SeoHead.svelte
diff --git a/src/lib/components/SuccessModal.svelte b/src/lib/components/ui/SuccessModal.svelte
similarity index 98%
rename from src/lib/components/SuccessModal.svelte
rename to src/lib/components/ui/SuccessModal.svelte
index b16565c..d320138 100644
--- a/src/lib/components/SuccessModal.svelte
+++ b/src/lib/components/ui/SuccessModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import ModalShell from '$lib/components/ModalShell.svelte';
+  import ModalShell from '$lib/components/ui/ModalShell.svelte';
 
   export let firstName: string;
   export let petName: string;
diff --git a/src/lib/content/homepage.ts b/src/lib/content/homepage.ts
index 0961688..39a7d51 100644
--- a/src/lib/content/homepage.ts
+++ b/src/lib/content/homepage.ts
@@ -36,9 +36,9 @@ export const homepageContent: HomePageContent = {
     title: 'Come home to a',
     highlight: 'calm, happy dog',
     mobileTitle: 'Come home to a\ncalm, happy dog',
-    seoHeading: 'Dog walking across Auckland Central',
+    seoHeading: 'Dog walking for Auckland\'s small & medium dogs',
     subtitle:
-      'Trusted dog walking for Auckland\'s small and medium dogs. Thoughtful matching, familiar routines, and calmer evenings at home.',
+      'The same trusted walker every time, in small groups. Never a rotating roster.',
     primaryCta: { label: 'Book a Meet & Greet', href: '#newlead', variant: 'yellow' },
     secondaryCta: {
       label: 'See how it works',
diff --git a/src/lib/styles/responsive.css b/src/lib/styles/responsive.css
index d22e119..d717456 100644
--- a/src/lib/styles/responsive.css
+++ b/src/lib/styles/responsive.css
@@ -260,35 +260,32 @@
   /* ── Full-bleed mobile hero ── */
 
   #hero {
+    --hero-photo-band: 46svh;
     min-height: 90svh;
     padding: 0;
     gap: 0;
     flex-direction: column;
-    justify-content: flex-end;
+    justify-content: flex-start;
   }
 
-  /* Full-section gradient: transparent top → Goodwalk green bottom.
-     hero-img is now a sibling of hero-inner (direct child of #hero),
-     so this ::after correctly overlays the full section. */
+  /* Two-zone mobile hero: the photo sits in its own clear band at the top so
+     Maya's face is never covered, and the copy sits below on solid Goodwalk
+     green. This ::after only softens the seam where the photo meets the green
+     text zone; it no longer veils the dog. */
   #hero::after {
-    inset: 0;
-    height: auto;
-    background: linear-gradient(
-      to bottom,
-      transparent 22%,
-      rgba(var(--brand-rgb), 0.45) 48%,
-      rgba(var(--brand-rgb), 0.88) 65%,
-      var(--surface-brand) 78%
-    );
+    inset: auto 0 auto 0;
+    top: calc(var(--hero-photo-band) - 72px);
+    height: 72px;
+    background: linear-gradient(to bottom, transparent, var(--surface-brand));
   }
 
-  /* Dog photo fills the entire section as a background layer */
+  /* Dog photo occupies a dedicated band at the top, not a full-bleed layer */
   .hero-img {
-    position: absolute;
-    inset: 0;
+    position: relative;
+    inset: auto;
     z-index: 0;
     width: 100%;
-    height: 100%;
+    height: var(--hero-photo-band);
     margin: 0;
     flex: none;
     display: block;
@@ -306,7 +303,7 @@
     max-width: none;
     margin: 0;
     object-fit: cover;
-    object-position: 37% center;
+    object-position: 35% 30%;
     transform: none;
   }
 
@@ -319,7 +316,7 @@
     width: 100%;
     max-width: none;
     margin: 0;
-    padding: 0 var(--space-container-x-mobile) 36px;
+    padding: 24px var(--space-container-x-mobile) 36px;
   }
 
   .hero-text {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 234bf71..5ead5a8 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,8 +3,8 @@
   import { navigating, page } from '$app/stores';
   import { afterNavigate, disableScrollHandling } from '$app/navigation';
   import { initClickTracking, trackPageView } from '$lib/analytics';
-  import MobileBookBar from '$lib/components/MobileBookBar.svelte';
-  import RouteSkeleton from '$lib/components/RouteSkeleton.svelte';
+  import MobileBookBar from '$lib/components/ui/MobileBookBar.svelte';
+  import RouteSkeleton from '$lib/components/ui/RouteSkeleton.svelte';
   import { isMobileCtaButtonEnabled } from '$lib/feature-flags';
   import readex400Woff2 from '@fontsource/readex-pro/files/readex-pro-latin-400-normal.woff2?url';
   import readex700Woff2 from '@fontsource/readex-pro/files/readex-pro-latin-700-normal.woff2?url';
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 7ac0c8c..1b7803b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-  import SeoHead from '$lib/components/SeoHead.svelte';
-  import Footer from '$lib/components/Footer.svelte';
-  import Header from '$lib/components/Header.svelte';
-  import HeroSection from '$lib/components/HeroSection.svelte';
-  import HowItWorksSection from '$lib/components/HowItWorksSection.svelte';
-  import InfoSection from '$lib/components/InfoSection.svelte';
-  import InstagramSection from '$lib/components/InstagramSection.svelte';
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import FounderStorySection from '$lib/components/FounderStorySection.svelte';
-  import ServicesSection from '$lib/components/ServicesSection.svelte';
-  import TestimonialsSection from '$lib/components/TestimonialsSection.svelte';
-  import ValuesSection from '$lib/components/ValuesSection.svelte';
-  import OnboardingPage from '$lib/components/OnboardingPage.svelte';
+  import SeoHead from '$lib/components/ui/SeoHead.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import HeroSection from '$lib/components/sections/HeroSection.svelte';
+  import HowItWorksSection from '$lib/components/sections/HowItWorksSection.svelte';
+  import InfoSection from '$lib/components/sections/InfoSection.svelte';
+  import InstagramSection from '$lib/components/sections/InstagramSection.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import FounderStorySection from '$lib/components/sections/FounderStorySection.svelte';
+  import ServicesSection from '$lib/components/sections/ServicesSection.svelte';
+  import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
+  import ValuesSection from '$lib/components/sections/ValuesSection.svelte';
+  import OnboardingPage from '$lib/components/pages/OnboardingPage.svelte';
   import { buildAreaServed } from '$lib/seo';
   import type { PageData } from './$types';
   import type { CallToAction } from '$lib/types';
@@ -139,19 +139,6 @@
                 name: 'Public Liability Insurance'
               }
             ]
-          },
-          {
-            '@context': 'https://schema.org',
-            '@type': 'HowTo',
-            name: 'How to start with Goodwalk',
-            description: data.content.howItWorks.intro,
-            totalTime: 'P14D',
-            step: data.content.howItWorks.steps.map((step, index) => ({
-              '@type': 'HowToStep',
-              position: index + 1,
-              name: step.title,
-              text: step.body
-            }))
           }
         ]
       : [];
diff --git a/src/routes/[slug]/+page.svelte b/src/routes/[slug]/+page.svelte
index 65e9a10..be79e07 100644
--- a/src/routes/[slug]/+page.svelte
+++ b/src/routes/[slug]/+page.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-  import SeoHead from '$lib/components/SeoHead.svelte';
-  import AboutPage from '$lib/components/AboutPage.svelte';
-  import Footer from '$lib/components/Footer.svelte';
-  import Header from '$lib/components/Header.svelte';
-  import BookingPage from '$lib/components/BookingPage.svelte';
-  import LegalPage from '$lib/components/LegalPage.svelte';
-  import PageHeader from '$lib/components/PageHeader.svelte';
-  import PricingPage from '$lib/components/PricingPage.svelte';
-  import TestimonialsPage from '$lib/components/TestimonialsPage.svelte';
+  import SeoHead from '$lib/components/ui/SeoHead.svelte';
+  import AboutPage from '$lib/components/pages/AboutPage.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import BookingPage from '$lib/components/pages/BookingPage.svelte';
+  import LegalPage from '$lib/components/pages/LegalPage.svelte';
+  import PageHeader from '$lib/components/ui/PageHeader.svelte';
+  import PricingPage from '$lib/components/pages/PricingPage.svelte';
+  import TestimonialsPage from '$lib/components/pages/TestimonialsPage.svelte';
   import { aboutPageContent } from '$lib/content/about';
-  import ServiceLandingPage from '$lib/components/ServiceLandingPage.svelte';
+  import ServiceLandingPage from '$lib/components/pages/ServiceLandingPage.svelte';
   import { dogWalkingContent } from '$lib/content/dog-walking';
   import { ourPricingContent } from '$lib/content/our-pricing';
   import { packWalksContent } from '$lib/content/pack-walks';
diff --git a/src/routes/contract/+page.svelte b/src/routes/contract/+page.svelte
index 51223f4..266e9b6 100644
--- a/src/routes/contract/+page.svelte
+++ b/src/routes/contract/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ContractPage from '$lib/components/ContractPage.svelte';
+  import ContractPage from '$lib/components/pages/ContractPage.svelte';
   import type { PageData } from './$types';
 
   export let data: PageData;
diff --git a/src/routes/locations/+page.svelte b/src/routes/locations/+page.svelte
index be7dd91..c5d42fd 100644
--- a/src/routes/locations/+page.svelte
+++ b/src/routes/locations/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import Header from '$lib/components/Header.svelte';
-  import Footer from '$lib/components/Footer.svelte';
-  import SeoHead from '$lib/components/SeoHead.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import SeoHead from '$lib/components/ui/SeoHead.svelte';
   import { locationPages } from '$lib/content/locations';
   import { buildBreadcrumb } from '$lib/seo';
   import type { PageData } from './$types';
diff --git a/src/routes/locations/[suburb]/+page.svelte b/src/routes/locations/[suburb]/+page.svelte
index 4b87793..d62d8d9 100644
--- a/src/routes/locations/[suburb]/+page.svelte
+++ b/src/routes/locations/[suburb]/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import Header from '$lib/components/Header.svelte';
-  import Footer from '$lib/components/Footer.svelte';
-  import SeoHead from '$lib/components/SeoHead.svelte';
-  import LocationPage from '$lib/components/LocationPage.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import SeoHead from '$lib/components/ui/SeoHead.svelte';
+  import LocationPage from '$lib/components/pages/LocationPage.svelte';
   import { buildLocationSeo } from '$lib/seo';
   import type { PageData } from './$types';
 
diff --git a/src/routes/meet-greet-v2/+page.svelte b/src/routes/meet-greet-v2/+page.svelte
index 44ff985..10afcfe 100644
--- a/src/routes/meet-greet-v2/+page.svelte
+++ b/src/routes/meet-greet-v2/+page.svelte
@@ -10,13 +10,13 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { fade } from 'svelte/transition';
-  import Footer from '$lib/components/Footer.svelte';
-  import Header from '$lib/components/Header.svelte';
-  import Icon from '$lib/components/Icon.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
   import { homepageContent } from '$lib/content/homepage';
 
-  type SuccessModalComponentType = typeof import('$lib/components/SuccessModal.svelte').default;
-  type ErrorModalComponentType = typeof import('$lib/components/ErrorModal.svelte').default;
+  type SuccessModalComponentType = typeof import('$lib/components/ui/SuccessModal.svelte').default;
+  type ErrorModalComponentType = typeof import('$lib/components/ui/ErrorModal.svelte').default;
 
   const navigation = homepageContent.navigation;
   const footerContent = homepageContent.footer;
@@ -131,11 +131,11 @@
 
   async function ensureSuccessModal() {
     if (SuccessModalComponent) return;
-    SuccessModalComponent = (await import('$lib/components/SuccessModal.svelte')).default;
+    SuccessModalComponent = (await import('$lib/components/ui/SuccessModal.svelte')).default;
   }
   async function ensureErrorModal() {
     if (ErrorModalComponent) return;
-    ErrorModalComponent = (await import('$lib/components/ErrorModal.svelte')).default;
+    ErrorModalComponent = (await import('$lib/components/ui/ErrorModal.svelte')).default;
   }
 
   function noteInteraction() {
diff --git a/src/routes/owner/welcome/+page.svelte b/src/routes/owner/welcome/[[tab]]/+page.svelte
similarity index 100%
rename from src/routes/owner/welcome/+page.svelte
rename to src/routes/owner/welcome/[[tab]]/+page.svelte
diff --git a/src/routes/variants-contact-form/+page.svelte b/src/routes/variants-contact-form/+page.svelte
index 644a475..2a4e3cc 100644
--- a/src/routes/variants-contact-form/+page.svelte
+++ b/src/routes/variants-contact-form/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  import PageHeader from '$lib/components/PageHeader.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
+  import PageHeader from '$lib/components/ui/PageHeader.svelte';
   import VariantApplicationFields from '$lib/components/contact-form-variants/VariantApplicationFields.svelte';
 
   type VariantTab = {
diff --git a/src/routes/variants/homepage-hero/+page.svelte b/src/routes/variants/homepage-hero/+page.svelte
index 6c621e3..674687f 100644
--- a/src/routes/variants/homepage-hero/+page.svelte
+++ b/src/routes/variants/homepage-hero/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   const heroImage = '/images/smiling-happy-dog-maya.webp';
 
diff --git a/src/routes/variants/instagram-cta/+page.svelte b/src/routes/variants/instagram-cta/+page.svelte
index cba11d9..b079570 100644
--- a/src/routes/variants/instagram-cta/+page.svelte
+++ b/src/routes/variants/instagram-cta/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '$lib/components/Icon.svelte';
+  import Icon from '$lib/components/ui/Icon.svelte';
 
   const instagramHref = 'https://www.instagram.com/goodwalk.nz/';
 
diff --git a/src/routes/variants/pack-first/+page.svelte b/src/routes/variants/pack-first/+page.svelte
index 56d6e60..b1fe4ad 100644
--- a/src/routes/variants/pack-first/+page.svelte
+++ b/src/routes/variants/pack-first/+page.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import SeoHead from '$lib/components/SeoHead.svelte';
-  import Footer from '$lib/components/Footer.svelte';
-  import Header from '$lib/components/Header.svelte';
-  import HeroSection from '$lib/components/HeroSection.svelte';
-  import HowItWorksSection from '$lib/components/HowItWorksSection.svelte';
-  import InfoSection from '$lib/components/InfoSection.svelte';
-  import InstagramSection from '$lib/components/InstagramSection.svelte';
-  import BookingWizard from '$lib/components/BookingWizard.svelte';
-  import FounderStorySection from '$lib/components/FounderStorySection.svelte';
-  import ServicesSection from '$lib/components/ServicesSection.svelte';
-  import TestimonialsSection from '$lib/components/TestimonialsSection.svelte';
-  import ValuesSection from '$lib/components/ValuesSection.svelte';
+  import SeoHead from '$lib/components/ui/SeoHead.svelte';
+  import Footer from '$lib/components/ui/Footer.svelte';
+  import Header from '$lib/components/ui/Header.svelte';
+  import HeroSection from '$lib/components/sections/HeroSection.svelte';
+  import HowItWorksSection from '$lib/components/sections/HowItWorksSection.svelte';
+  import InfoSection from '$lib/components/sections/InfoSection.svelte';
+  import InstagramSection from '$lib/components/sections/InstagramSection.svelte';
+  import BookingWizard from '$lib/components/sections/BookingWizard.svelte';
+  import FounderStorySection from '$lib/components/sections/FounderStorySection.svelte';
+  import ServicesSection from '$lib/components/sections/ServicesSection.svelte';
+  import TestimonialsSection from '$lib/components/sections/TestimonialsSection.svelte';
+  import ValuesSection from '$lib/components/sections/ValuesSection.svelte';
   import type { PageData } from './$types';
 
   export let data: PageData;
diff --git a/vite.config.ts b/vite.config.ts
index 0e8a1f8..ba1d9f8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -169,6 +169,7 @@ export default defineConfig(() => {
 
   const createMailProxy = (apiPath: keyof typeof proxyRoutes): ProxyOptions => ({
     target: submitProxyTarget,
+    changeOrigin: true,
     rewrite: (path) => path.replace(apiPath, proxyRoutes[apiPath]),
     configure(proxy) {
       proxy.on('error', (error: NodeJS.ErrnoException, req, res) => {
@@ -213,14 +214,17 @@ export default defineConfig(() => {
         '/api/contract-submit': createMailProxy('/api/contract-submit'),
         '/api/auth': {
           target: submitProxyTarget,
+          changeOrigin: true,
           rewrite: (path) => path.replace('/api/auth', '/auth'),
         },
         '/api/owner': {
           target: submitProxyTarget,
+          changeOrigin: true,
           rewrite: (path) => path.replace('/api/owner', '/owner'),
         },
         '/api/save-draft': {
           target: submitProxyTarget,
+          changeOrigin: true,
           rewrite: (path) => path.replace('/api/save-draft', '/auth/save-draft'),
         },
       }