From f828877ff1090cc9001ede9e5be3cfdfa26cec7f Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 10:46:08 +0200
Subject: [PATCH 1/7] feat: add organization localization settings and
 candidate demographics

- Implemented organization settings for name display format and date format.
- Created API endpoints for fetching and updating organization settings.
- Added new fields to the candidate schema: display name, gender, and date of birth.
- Updated job schema to include a salary negotiable flag.
- Created a new org_settings table in the database with appropriate constraints.
- Added validation schemas for organization settings.
- Developed a Vue component for managing localization settings in the dashboard.
- Enhanced email sending functionality to support SMTP and Resend providers.

Co-authored-by: Copilot <copilot@github.com>
---
 .env.example                                  |  18 ++
 SELF-HOSTING.md                               |  37 ++-
 app/components/AppTopBar.vue                  |  32 +-
 app/components/SettingsMobileNav.vue          |   8 +-
 app/components/SettingsSidebar.vue            |   9 +-
 app/composables/useCandidate.ts               |   3 +
 app/composables/useCandidates.ts              |   3 +
 app/composables/useJob.ts                     |  12 +-
 app/composables/useOrgSettings.ts             |  66 ++++
 app/pages/dashboard/candidates/[id].vue       | 107 ++++++-
 app/pages/dashboard/candidates/new.vue        | 232 ++++++++++++++
 app/pages/dashboard/jobs/[id]/settings.vue    | 194 +++++++-----
 app/pages/dashboard/jobs/new.vue              |  43 ++-
 app/pages/dashboard/settings/localization.vue | 252 +++++++++++++++
 app/pages/jobs/[slug]/index.vue               |   4 +-
 package-lock.json                             |  21 ++
 package.json                                  |   2 +
 server/api/candidates/[id].get.ts             |  12 +
 server/api/candidates/[id].patch.ts           |   3 +
 server/api/candidates/index.get.ts            |   7 +
 server/api/candidates/index.post.ts           |   6 +
 .../interviews/[id]/send-invitation.post.ts   |   7 +-
 server/api/jobs/[id].get.ts                   |   1 +
 server/api/jobs/[id].patch.ts                 |   1 +
 server/api/jobs/index.post.ts                 |   2 +
 server/api/org-settings/index.get.ts          |  21 ++
 server/api/org-settings/index.patch.ts        |  39 +++
 server/api/public/jobs/[slug].get.ts          |   1 +
 ...21_candidate_demographics_org_settings.sql |  38 +++
 .../migrations/0022_salary_negotiable.sql     |   7 +
 server/database/schema/app.ts                 |  37 +++
 server/utils/email.ts                         | 291 ++++++++++--------
 server/utils/env.ts                           |  37 ++-
 server/utils/schemas/candidate.ts             |  21 ++
 server/utils/schemas/job.ts                   |  33 +-
 server/utils/schemas/orgSettings.ts           |  10 +
 36 files changed, 1363 insertions(+), 254 deletions(-)
 create mode 100644 app/composables/useOrgSettings.ts
 create mode 100644 app/pages/dashboard/settings/localization.vue
 create mode 100644 server/api/org-settings/index.get.ts
 create mode 100644 server/api/org-settings/index.patch.ts
 create mode 100644 server/database/migrations/0021_candidate_demographics_org_settings.sql
 create mode 100644 server/database/migrations/0022_salary_negotiable.sql
 create mode 100644 server/utils/schemas/orgSettings.ts

diff --git a/.env.example b/.env.example
index 2f3a864..a110ad9 100644
--- a/.env.example
+++ b/.env.example
@@ -97,6 +97,24 @@ NUXT_PUBLIC_SITE_URL=http://localhost:3000
 # Display name for the SSO button (default: "SSO")
 # OIDC_PROVIDER_NAME=Company SSO
 
+# ─── Optional: Transactional Email ───────────────────────────────────────────
+# Reqcore logs emails to the console by default (safe for local dev).
+# For production, configure one of the providers below.
+# SMTP takes priority over Resend when SMTP_HOST is set.
+
+# Option A: SMTP (recommended for self-hosted / enterprise setups)
+# Supports any SMTP server: Postfix, Gmail, Exchange, Mailcow, Mailu, etc.
+# SMTP_HOST=smtp.example.com
+# SMTP_PORT=587
+# SMTP_USER=reqcore@example.com
+# SMTP_PASS=your-smtp-password
+# SMTP_FROM="Reqcore <noreply@example.com>"
+# SMTP_SECURE=false   # true = implicit TLS (port 465), false = STARTTLS (port 587)
+
+# Option B: Resend (free tier: 3,000 emails/month — resend.com)
+# RESEND_API_KEY=re_xxxxxxxxxxxx
+# RESEND_FROM_EMAIL="Reqcore <noreply@yourcompany.com>"
+
 # ─── Optional: Social Sign-In (Google, GitHub, Microsoft) ────────────────────
 # Enable social login buttons on the sign-in and sign-up pages.
 # Each provider requires both CLIENT_ID and CLIENT_SECRET to be set.
diff --git a/SELF-HOSTING.md b/SELF-HOSTING.md
index 50813f3..cc487cc 100644
--- a/SELF-HOSTING.md
+++ b/SELF-HOSTING.md
@@ -440,7 +440,37 @@ docker compose up --build -d
 
 By default, Reqcore logs email content to the console (useful for development). For production, configure a transactional email service.
 
-### Using Resend (Recommended)
+**Priority:** When `SMTP_HOST` is set, SMTP is used. Otherwise, if `RESEND_API_KEY` is set, Resend is used. If neither is configured, emails are logged to the console.
+
+### Option A: SMTP (recommended for self-hosted setups)
+
+SMTP works with any mail server — Postfix, Gmail, Exchange, Mailcow, Mailu, etc. No external service dependency.
+
+1. Add to your `.env` file:
+
+```bash
+SMTP_HOST=smtp.example.com
+SMTP_PORT=587
+SMTP_USER=reqcore@example.com
+SMTP_PASS=your-smtp-password
+SMTP_FROM="Reqcore <noreply@example.com>"
+SMTP_SECURE=false    # true for implicit TLS (port 465), false for STARTTLS (port 587)
+```
+
+2. Restart: `docker compose up --build -d`
+
+**Common setups:**
+
+| Provider | SMTP_HOST | SMTP_PORT | SMTP_SECURE |
+|---|---|---|---|
+| Gmail (App Password) | `smtp.gmail.com` | `587` | `false` |
+| Outlook / Office 365 | `smtp.office365.com` | `587` | `false` |
+| Mailcow / Mailu | your server hostname | `587` | `false` |
+| Custom Postfix | your server hostname | `587` or `465` | `false` / `true` |
+
+> For Gmail, generate an [App Password](https://support.google.com/accounts/answer/185833) — your regular Gmail password will not work.
+
+### Option B: Resend
 
 1. Sign up at [resend.com](https://resend.com) (free tier: 3,000 emails/month)
 2. Verify your sending domain
@@ -454,11 +484,6 @@ RESEND_FROM_EMAIL="Reqcore <noreply@yourcompany.com>"
 
 5. Restart: `docker compose up --build -d`
 
-This enables:
-- Team member invitation emails
-- Interview scheduling notifications
-- Candidate communication emails
-
 ---
 
 ## Security Best Practices
diff --git a/app/components/AppTopBar.vue b/app/components/AppTopBar.vue
index b8dce83..e87f0f0 100644
--- a/app/components/AppTopBar.vue
+++ b/app/components/AppTopBar.vue
@@ -144,6 +144,22 @@ watch(() => route.path, () => {
   showGetStartedMenu.value = false
 })
 
+// ─────────────────────────────────────────────
+// New Job button
+// ─────────────────────────────────────────────
+
+const newJobResetSignal = useState('new-job-reset-signal', () => 0)
+
+function handleNewJobClick() {
+  const newJobPath = localePath('/dashboard/jobs/new')
+  if (route.path === newJobPath) {
+    // Already on the page: signal the wizard to reset instead of navigating
+    newJobResetSignal.value++
+  } else {
+    navigateTo(newJobPath)
+  }
+}
+
 // Close user menu on outside click
 const userMenuRef = useTemplateRef<HTMLElement>('userMenuRoot')
 function onClickOutsideUser(e: MouseEvent) {
@@ -264,13 +280,13 @@ onUnmounted(() => {
           </div>
 
           <!-- New Job button (desktop) -->
-          <NuxtLink
-            :to="$localePath('/dashboard/jobs/new')"
-            class="hidden sm:inline-flex items-center gap-1.5 rounded-lg bg-brand-600 px-3.5 py-1.5 text-[13px] font-semibold text-white shadow-sm shadow-brand-600/20 hover:bg-brand-700 hover:shadow-md hover:shadow-brand-600/25 active:bg-brand-800 transition-all duration-200 no-underline"
+          <button
+            class="hidden sm:inline-flex items-center gap-1.5 rounded-lg bg-brand-600 px-3.5 py-1.5 text-[13px] font-semibold text-white shadow-sm shadow-brand-600/20 hover:bg-brand-700 hover:shadow-md hover:shadow-brand-600/25 active:bg-brand-800 transition-all duration-200 border-0 cursor-pointer"
+            @click="handleNewJobClick"
           >
             <Plus class="size-3.5" />
             New Job
-          </NuxtLink>
+          </button>
 
           <!-- Org Switcher -->
           <div class="hidden lg:block ml-1">
@@ -494,13 +510,13 @@ onUnmounted(() => {
             </span>
           </NuxtLink>
 
-          <NuxtLink
-            :to="$localePath('/dashboard/jobs/new')"
-            class="flex items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium bg-brand-600 text-white hover:bg-brand-700 transition-colors no-underline sm:hidden mt-1"
+          <button
+            class="flex items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium bg-brand-600 text-white hover:bg-brand-700 transition-colors sm:hidden mt-1 border-0 cursor-pointer w-full"
+            @click="handleNewJobClick(); showMobileMenu = false"
           >
             <Plus class="size-4" />
             New Job
-          </NuxtLink>
+          </button>
 
           <!-- Get Started CTA (demo mode, mobile) -->
           <template v-if="isDemo">
diff --git a/app/components/SettingsMobileNav.vue b/app/components/SettingsMobileNav.vue
index 96b0227..57d0096 100644
--- a/app/components/SettingsMobileNav.vue
+++ b/app/components/SettingsMobileNav.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import {
-  Building2, Users, UserCircle, ChevronLeft, Plug, Brain, ShieldCheck,
+  Building2, Users, UserCircle, ChevronLeft, Plug, Brain, ShieldCheck, Globe,
 } from 'lucide-vue-next'
 
 const route = useRoute()
@@ -13,6 +13,12 @@ const settingsNav = [
     icon: Building2,
     exact: true,
   },
+  {
+    label: 'Localization',
+    to: '/dashboard/settings/localization',
+    icon: Globe,
+    exact: true,
+  },
   {
     label: 'Members',
     to: '/dashboard/settings/members',
diff --git a/app/components/SettingsSidebar.vue b/app/components/SettingsSidebar.vue
index 95cb2c4..e6f47eb 100644
--- a/app/components/SettingsSidebar.vue
+++ b/app/components/SettingsSidebar.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import {
-  Building2, Users, UserCircle, ChevronLeft, Settings, Plug, Brain, ShieldCheck,
+  Building2, Users, UserCircle, ChevronLeft, Settings, Plug, Brain, ShieldCheck, Globe,
 } from 'lucide-vue-next'
 
 const route = useRoute()
@@ -14,6 +14,13 @@ const settingsNav = [
     icon: Building2,
     exact: true,
   },
+  {
+    label: 'Localization',
+    description: 'Names & date formats',
+    to: '/dashboard/settings/localization',
+    icon: Globe,
+    exact: true,
+  },
   {
     label: 'Members',
     description: 'Team & invitations',
diff --git a/app/composables/useCandidate.ts b/app/composables/useCandidate.ts
index 5b96303..b84041c 100644
--- a/app/composables/useCandidate.ts
+++ b/app/composables/useCandidate.ts
@@ -22,8 +22,11 @@ export function useCandidate(id: MaybeRefOrGetter<string>) {
   async function updateCandidate(payload: Partial<{
     firstName: string
     lastName: string
+    displayName: string | null
     email: string
     phone: string | null
+    gender: 'male' | 'female' | 'other' | 'prefer_not_to_say' | null
+    dateOfBirth: string | null
   }>) {
     try {
       const updated = await $fetch(`/api/candidates/${candidateId.value}`, {
diff --git a/app/composables/useCandidates.ts b/app/composables/useCandidates.ts
index 2f3a04e..5d57b0c 100644
--- a/app/composables/useCandidates.ts
+++ b/app/composables/useCandidates.ts
@@ -27,8 +27,11 @@ export function useCandidates(options?: {
   async function createCandidate(payload: {
     firstName: string
     lastName: string
+    displayName?: string
     email: string
     phone?: string
+    gender?: 'male' | 'female' | 'other' | 'prefer_not_to_say'
+    dateOfBirth?: string
   }) {
     try {
       const created = await $fetch('/api/candidates', {
diff --git a/app/composables/useJob.ts b/app/composables/useJob.ts
index f4e15c5..f1ecc37 100644
--- a/app/composables/useJob.ts
+++ b/app/composables/useJob.ts
@@ -20,12 +20,20 @@ export function useJob(id: MaybeRefOrGetter<string>) {
   /** Update job fields (partial) and refresh both detail and list caches */
   async function updateJob(payload: Partial<{
     title: string
-    description: string
-    location: string
+    description: string | null
+    location: string | null
     type: 'full_time' | 'part_time' | 'contract' | 'internship'
     status: 'draft' | 'open' | 'closed' | 'archived'
+    salaryMin: number | null
+    salaryMax: number | null
+    salaryCurrency: string | null
+    salaryUnit: 'YEAR' | 'MONTH' | 'HOUR' | null
+    salaryNegotiable: boolean
+    remoteStatus: 'remote' | 'hybrid' | 'onsite' | null
+    validThrough: Date | null
     requireResume: boolean
     requireCoverLetter: boolean
+    autoScoreOnApply: boolean
   }>) {
     try {
       const updated = await $fetch(`/api/jobs/${jobId.value}`, {
diff --git a/app/composables/useOrgSettings.ts b/app/composables/useOrgSettings.ts
new file mode 100644
index 0000000..4e88b14
--- /dev/null
+++ b/app/composables/useOrgSettings.ts
@@ -0,0 +1,66 @@
+/**
+ * Composable for fetching and updating organization localization settings.
+ * Provides reactive settings and a utility for formatting candidate names/dates.
+ */
+export function useOrgSettings() {
+  const { data, status, refresh } = useFetch('/api/org-settings', {
+    key: 'org-settings',
+    headers: useRequestHeaders(['cookie']),
+  })
+
+  const nameDisplayFormat = computed(() => data.value?.nameDisplayFormat ?? 'first_last')
+  const dateFormat = computed(() => data.value?.dateFormat ?? 'mdy')
+
+  /**
+   * Format a candidate's full name according to the org's display preference.
+   * Falls back to "First Last" if displayName is not set.
+   */
+  function formatCandidateName(candidate: {
+    firstName: string
+    lastName: string
+    displayName?: string | null
+  }): string {
+    if (candidate.displayName?.trim()) return candidate.displayName.trim()
+    if (nameDisplayFormat.value === 'last_first') {
+      return `${candidate.lastName} ${candidate.firstName}`
+    }
+    return `${candidate.firstName} ${candidate.lastName}`
+  }
+
+  /**
+   * Format a date string (YYYY-MM-DD) according to the org's date format setting.
+   * Returns an empty string for null/undefined values.
+   */
+  function formatDate(dateStr: string | null | undefined): string {
+    if (!dateStr) return ''
+    const [year, month, day] = dateStr.split('-')
+    if (!year || !month || !day) return dateStr
+    switch (dateFormat.value) {
+      case 'dmy': return `${day}/${month}/${year}`
+      case 'ymd': return `${year}-${month}-${day}`
+      case 'mdy':
+      default: return `${month}/${day}/${year}`
+    }
+  }
+
+  async function updateSettings(payload: {
+    nameDisplayFormat?: 'first_last' | 'last_first'
+    dateFormat?: 'mdy' | 'dmy' | 'ymd'
+  }) {
+    await $fetch('/api/org-settings', {
+      method: 'PATCH',
+      body: payload,
+    })
+    await refresh()
+  }
+
+  return {
+    nameDisplayFormat,
+    dateFormat,
+    status,
+    formatCandidateName,
+    formatDate,
+    updateSettings,
+    refresh,
+  }
+}
diff --git a/app/pages/dashboard/candidates/[id].vue b/app/pages/dashboard/candidates/[id].vue
index 6457cec..08d0367 100644
--- a/app/pages/dashboard/candidates/[id].vue
+++ b/app/pages/dashboard/candidates/[id].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ArrowLeft, Pencil, Trash2, Mail, Phone, Calendar, Clock, Briefcase, FileText, Plus, Upload, Download, Eye, X, AlertTriangle } from 'lucide-vue-next'
+import { ArrowLeft, Pencil, Trash2, Mail, Phone, Calendar, Clock, Briefcase, FileText, Plus, Upload, Download, Eye, X, AlertTriangle, Venus, Mars } from 'lucide-vue-next'
 import { z } from 'zod'
 import { usePreviewReadOnly } from '~/composables/usePreviewReadOnly'
 
@@ -14,6 +14,7 @@ const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 const toast = useToast()
 
 const { candidate, status: fetchStatus, error, refresh, updateCandidate, deleteCandidate } = useCandidate(candidateId)
+const { formatCandidateName, formatDate } = useOrgSettings()
 
 useSeoMeta({
   title: computed(() =>
@@ -37,8 +38,11 @@ const isEditing = ref(false)
 const editForm = ref({
   firstName: '',
   lastName: '',
+  displayName: '',
   email: '',
   phone: '',
+  gender: '' as '' | 'male' | 'female' | 'other' | 'prefer_not_to_say',
+  dateOfBirth: '',
 })
 
 function startEdit() {
@@ -46,8 +50,11 @@ function startEdit() {
   editForm.value = {
     firstName: candidate.value.firstName,
     lastName: candidate.value.lastName,
+    displayName: candidate.value.displayName ?? '',
     email: candidate.value.email,
     phone: candidate.value.phone ?? '',
+    gender: (candidate.value.gender as '' | 'male' | 'female' | 'other' | 'prefer_not_to_say') ?? '',
+    dateOfBirth: candidate.value.dateOfBirth ?? '',
   }
   isEditing.value = true
 }
@@ -60,15 +67,30 @@ function cancelEdit() {
 const editSchema = z.object({
   firstName: z.string().min(1, 'First name is required').max(100),
   lastName: z.string().min(1, 'Last name is required').max(100),
+  displayName: z.string().max(200).optional(),
   email: z.string().min(1, 'Email is required').email('Invalid email address').max(255),
   phone: z.string().max(50).optional(),
+  gender: z.enum(['male', 'female', 'other', 'prefer_not_to_say']).optional(),
+  dateOfBirth: z
+    .string()
+    .regex(/^\d{4}-\d{2}-\d{2}$/, 'Date must be YYYY-MM-DD')
+    .refine((v) => {
+      const d = new Date(v)
+      return !isNaN(d.getTime()) && d.getFullYear() >= 1900 && d <= new Date()
+    }, 'Must be a valid past date')
+    .optional(),
 })
 
 const isSaving = ref(false)
 const editErrors = ref<Record<string, string>>({})
 
 async function handleSave() {
-  const result = editSchema.safeParse(editForm.value)
+  const result = editSchema.safeParse({
+    ...editForm.value,
+    gender: editForm.value.gender || undefined,
+    dateOfBirth: editForm.value.dateOfBirth || undefined,
+    displayName: editForm.value.displayName || undefined,
+  })
   if (!result.success) {
     editErrors.value = {}
     for (const issue of result.error.issues) {
@@ -84,8 +106,11 @@ async function handleSave() {
     await updateCandidate({
       firstName: editForm.value.firstName,
       lastName: editForm.value.lastName,
+      displayName: editForm.value.displayName || null,
       email: editForm.value.email,
       phone: editForm.value.phone || null,
+      gender: (editForm.value.gender as 'male' | 'female' | 'other' | 'prefer_not_to_say') || null,
+      dateOfBirth: editForm.value.dateOfBirth || null,
     })
     isEditing.value = false
   } catch (err: any) {
@@ -133,6 +158,13 @@ const applicationStatusClasses: Record<string, string> = {
   rejected: 'bg-surface-100 text-surface-500 dark:bg-surface-800 dark:text-surface-400',
 }
 
+const genderLabels: Record<string, string> = {
+  male: 'Male',
+  female: 'Female',
+  other: 'Other',
+  prefer_not_to_say: 'Prefer not to say',
+}
+
 const documentTypeLabels: Record<string, string> = {
   resume: 'Resume',
   cover_letter: 'Cover Letter',
@@ -303,7 +335,7 @@ function formatFileSize(bytes: number | null | undefined): string {
         <div class="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4 mb-6">
           <div class="min-w-0">
             <h1 class="text-2xl font-bold text-surface-900 dark:text-surface-50 truncate mb-1">
-              {{ candidate.firstName }} {{ candidate.lastName }}
+              {{ formatCandidateName(candidate) }}
             </h1>
             <div class="flex flex-col sm:flex-row sm:items-center gap-1 sm:gap-4 text-sm text-surface-500">
               <a
@@ -359,6 +391,24 @@ function formatFileSize(bytes: number | null | undefined): string {
                 {{ candidate.phone || '—' }}
               </dd>
             </div>
+            <div v-if="candidate.gender">
+              <dt class="text-surface-400">Gender</dt>
+              <dd class="text-surface-700 dark:text-surface-200 font-medium">
+                {{ genderLabels[candidate.gender] ?? candidate.gender }}
+              </dd>
+            </div>
+            <div v-if="candidate.dateOfBirth">
+              <dt class="text-surface-400">Date of Birth</dt>
+              <dd class="text-surface-700 dark:text-surface-200 font-medium">
+                {{ formatDate(candidate.dateOfBirth) }}
+              </dd>
+            </div>
+            <div v-if="candidate.displayName">
+              <dt class="text-surface-400">Display Name</dt>
+              <dd class="text-surface-700 dark:text-surface-200 font-medium">
+                {{ candidate.displayName }}
+              </dd>
+            </div>
             <div>
               <dt class="text-surface-400 inline-flex items-center gap-1">
                 <Calendar class="size-3.5" />
@@ -736,6 +786,55 @@ function formatFileSize(bytes: number | null | undefined): string {
             />
           </div>
 
+          <!-- Display Name -->
+          <div>
+            <label for="edit-displayName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+              Display Name
+              <span class="ml-1 text-xs font-normal text-surface-400">(optional — overrides default name format)</span>
+            </label>
+            <input
+              id="edit-displayName"
+              v-model="editForm.displayName"
+              type="text"
+              placeholder="e.g. Nguyễn Văn A"
+              class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+            />
+          </div>
+
+          <!-- Gender + Date of Birth -->
+          <div class="grid grid-cols-1 sm:grid-cols-2 gap-5">
+            <div>
+              <label for="edit-gender" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                Gender
+              </label>
+              <select
+                id="edit-gender"
+                v-model="editForm.gender"
+                class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+              >
+                <option value="">Not specified</option>
+                <option value="male">Male</option>
+                <option value="female">Female</option>
+                <option value="other">Other</option>
+                <option value="prefer_not_to_say">Prefer not to say</option>
+              </select>
+            </div>
+            <div>
+              <label for="edit-dateOfBirth" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                Date of Birth
+              </label>
+              <input
+                id="edit-dateOfBirth"
+                v-model="editForm.dateOfBirth"
+                type="date"
+                :max="new Date().toISOString().split('T')[0]"
+                class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+                :class="editErrors.dateOfBirth ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
+              />
+              <p v-if="editErrors.dateOfBirth" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ editErrors.dateOfBirth }}</p>
+            </div>
+          </div>
+
           <!-- Actions -->
           <div class="flex items-center gap-3 pt-2">
             <button
@@ -763,7 +862,7 @@ function formatFileSize(bytes: number | null | undefined): string {
           <div class="relative bg-white dark:bg-surface-900 rounded-xl shadow-xl p-6 max-w-sm w-full mx-4">
             <h3 class="text-lg font-semibold text-surface-900 dark:text-surface-50 mb-2">Delete Candidate</h3>
             <p class="text-sm text-surface-600 dark:text-surface-400 mb-4">
-              Are you sure you want to delete <strong>{{ candidate.firstName }} {{ candidate.lastName }}</strong>?
+              Are you sure you want to delete <strong>{{ formatCandidateName(candidate) }}</strong>?
               This will also delete all their applications and documents. This action cannot be undone.
             </p>
             <div class="flex justify-end gap-2">
diff --git a/app/pages/dashboard/candidates/new.vue b/app/pages/dashboard/candidates/new.vue
index 4f5d58f..96a043c 100644
--- a/app/pages/dashboard/candidates/new.vue
+++ b/app/pages/dashboard/candidates/new.vue
@@ -20,10 +20,242 @@ const { track } = useTrack()
 const form = ref({
   firstName: '',
   lastName: '',
+  displayName: '',
   email: '',
   phone: '',
+  gender: '' as '' | 'male' | 'female' | 'other' | 'prefer_not_to_say',
+  dateOfBirth: '',
 })
 
+const isSubmitting = ref(false)
+const errors = ref<Record<string, string>>({})
+const submitError = ref<string | null>(null)
+
+const formSchema = z.object({
+  firstName: z.string().min(1, 'First name is required').max(100),
+  lastName: z.string().min(1, 'Last name is required').max(100),
+  displayName: z.string().max(200).optional(),
+  email: z.string().min(1, 'Email is required').email('Invalid email address').max(255),
+  phone: z.string().max(50).optional(),
+  gender: z.enum(['male', 'female', 'other', 'prefer_not_to_say']).optional(),
+  dateOfBirth: z
+    .string()
+    .regex(/^\d{4}-\d{2}-\d{2}$/, 'Date must be YYYY-MM-DD')
+    .refine((v) => {
+      const d = new Date(v)
+      return !isNaN(d.getTime()) && d.getFullYear() >= 1900 && d <= new Date()
+    }, 'Must be a valid past date')
+    .optional(),
+})
+
+function validate(): boolean {
+  const result = formSchema.safeParse({
+    ...form.value,
+    gender: form.value.gender || undefined,
+    dateOfBirth: form.value.dateOfBirth || undefined,
+    displayName: form.value.displayName || undefined,
+  })
+  if (!result.success) {
+    errors.value = {}
+    for (const issue of result.error.issues) {
+      const field = issue.path[0]?.toString()
+      if (field) errors.value[field] = issue.message
+    }
+    return false
+  }
+  errors.value = {}
+  return true
+}
+
+async function handleSubmit() {
+  submitError.value = null
+  if (!validate()) return
+
+  isSubmitting.value = true
+  try {
+    await createCandidate({
+      firstName: form.value.firstName,
+      lastName: form.value.lastName,
+      displayName: form.value.displayName || undefined,
+      email: form.value.email,
+      phone: form.value.phone || undefined,
+      gender: (form.value.gender as 'male' | 'female' | 'other' | 'prefer_not_to_say') || undefined,
+      dateOfBirth: form.value.dateOfBirth || undefined,
+    })
+    track('candidate_added')
+    await navigateTo(localePath('/dashboard/candidates'))
+  } catch (err: any) {
+    const message = err.data?.statusMessage ?? 'Something went wrong'
+    // Show email conflict as a field-level error
+    if (err.statusCode === 409 || err.data?.statusCode === 409) {
+      errors.value.email = message
+    } else {
+      submitError.value = message
+    }
+  } finally {
+    isSubmitting.value = false
+  }
+}
+</script>
+
+<template>
+  <div class="mx-auto max-w-2xl">
+    <!-- Back link -->
+    <NuxtLink
+      :to="$localePath('/dashboard/candidates')"
+      class="inline-flex items-center gap-1 text-sm text-surface-500 dark:text-surface-400 hover:text-surface-700 dark:hover:text-surface-200 mb-6 transition-colors"
+    >
+      <ArrowLeft class="size-4" />
+      Back to Candidates
+    </NuxtLink>
+
+    <h1 class="text-2xl font-bold text-surface-900 dark:text-surface-100 mb-6">Add Candidate</h1>
+
+    <!-- Server error -->
+    <div
+      v-if="submitError"
+      class="rounded-lg border border-danger-200 dark:border-danger-800 bg-danger-50 dark:bg-danger-950 p-3 text-sm text-danger-700 dark:text-danger-400 mb-4"
+    >
+      {{ submitError }}
+    </div>
+
+    <form class="space-y-5" @submit.prevent="handleSubmit">
+      <!-- First Name -->
+      <div>
+        <label for="firstName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+          First Name <span class="text-danger-500">*</span>
+        </label>
+        <input
+          id="firstName"
+          v-model="form.firstName"
+          type="text"
+          placeholder="e.g. Jane"
+          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+          :class="errors.firstName ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
+        />
+        <p v-if="errors.firstName" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.firstName }}</p>
+      </div>
+
+      <!-- Last Name -->
+      <div>
+        <label for="lastName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+          Last Name <span class="text-danger-500">*</span>
+        </label>
+        <input
+          id="lastName"
+          v-model="form.lastName"
+          type="text"
+          placeholder="e.g. Doe"
+          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+          :class="errors.lastName ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
+        />
+        <p v-if="errors.lastName" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.lastName }}</p>
+      </div>
+
+      <!-- Display Name (optional) -->
+      <div>
+        <label for="displayName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+          Display Name
+          <span class="ml-1 text-xs font-normal text-surface-400">(optional — overrides default name format)</span>
+        </label>
+        <input
+          id="displayName"
+          v-model="form.displayName"
+          type="text"
+          placeholder="e.g. Nguyễn Văn A"
+          class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+        />
+        <p v-if="errors.displayName" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.displayName }}</p>
+      </div>
+
+      <!-- Email -->
+      <div>
+        <label for="email" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+          Email <span class="text-danger-500">*</span>
+        </label>
+        <input
+          id="email"
+          v-model="form.email"
+          type="email"
+          placeholder="e.g. jane.doe@example.com"
+          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+          :class="errors.email ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
+        />
+        <p v-if="errors.email" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.email }}</p>
+      </div>
+
+      <!-- Phone -->
+      <div>
+        <label for="phone" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+          Phone
+        </label>
+        <input
+          id="phone"
+          v-model="form.phone"
+          type="tel"
+          placeholder="e.g. +1 (555) 123-4567"
+          class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+        />
+      </div>
+
+      <!-- Gender + Date of Birth (side-by-side on wider screens) -->
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-5">
+        <!-- Gender -->
+        <div>
+          <label for="gender" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+            Gender
+          </label>
+          <select
+            id="gender"
+            v-model="form.gender"
+            class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+          >
+            <option value="">Not specified</option>
+            <option value="male">Male</option>
+            <option value="female">Female</option>
+            <option value="other">Other</option>
+            <option value="prefer_not_to_say">Prefer not to say</option>
+          </select>
+        </div>
+
+        <!-- Date of Birth -->
+        <div>
+          <label for="dateOfBirth" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+            Date of Birth
+          </label>
+          <input
+            id="dateOfBirth"
+            v-model="form.dateOfBirth"
+            type="date"
+            :max="new Date().toISOString().split('T')[0]"
+            class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+            :class="errors.dateOfBirth ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
+          />
+          <p v-if="errors.dateOfBirth" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.dateOfBirth }}</p>
+        </div>
+      </div>
+
+      <!-- Actions -->
+      <div class="flex items-center gap-3 pt-2">
+        <button
+          type="submit"
+          :disabled="isSubmitting"
+          class="inline-flex items-center rounded-lg bg-brand-600 px-4 py-2 text-sm font-medium text-white hover:bg-brand-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+        >
+          {{ isSubmitting ? 'Adding…' : 'Add Candidate' }}
+        </button>
+        <NuxtLink
+          :to="$localePath('/dashboard/candidates')"
+          class="rounded-lg border border-surface-300 dark:border-surface-700 px-4 py-2 text-sm font-medium text-surface-700 dark:text-surface-300 hover:bg-surface-50 dark:hover:bg-surface-800 transition-colors"
+        >
+          Cancel
+        </NuxtLink>
+      </div>
+    </form>
+  </div>
+</template>
+
+
 const isSubmitting = ref(false)
 const errors = ref<Record<string, string>>({})
 const submitError = ref<string | null>(null)
diff --git a/app/pages/dashboard/jobs/[id]/settings.vue b/app/pages/dashboard/jobs/[id]/settings.vue
index 20166ca..b7c9f39 100644
--- a/app/pages/dashboard/jobs/[id]/settings.vue
+++ b/app/pages/dashboard/jobs/[id]/settings.vue
@@ -34,10 +34,11 @@ const form = ref({
   location: '',
   type: 'full_time' as string,
   slug: '',
-  salaryMin: undefined as number | undefined,
-  salaryMax: undefined as number | undefined,
+  salaryMin: null as number | null,
+  salaryMax: null as number | null,
   salaryCurrency: '',
   salaryUnit: '' as string,
+  salaryNegotiable: false,
   remoteStatus: '' as string,
   validThrough: '',
   requireResume: false,
@@ -53,10 +54,11 @@ watch(job, (j) => {
       location: j.location ?? '',
       type: j.type ?? 'full_time',
       slug: j.slug ?? '',
-      salaryMin: j.salaryMin ?? undefined,
-      salaryMax: j.salaryMax ?? undefined,
+      salaryMin: j.salaryMin ?? null,
+      salaryMax: j.salaryMax ?? null,
       salaryCurrency: j.salaryCurrency ?? '',
       salaryUnit: j.salaryUnit ?? '',
+      salaryNegotiable: j.salaryNegotiable ?? false,
       remoteStatus: j.remoteStatus ?? '',
       validThrough: j.validThrough ? new Date(j.validThrough).toISOString().split('T')[0] ?? '' : '',
       requireResume: j.requireResume ?? false,
@@ -66,6 +68,16 @@ watch(job, (j) => {
   }
 }, { immediate: true })
 
+// When "Negotiable" is toggled on, clear the salary range fields
+watch(() => form.value.salaryNegotiable, (negotiable) => {
+  if (negotiable) {
+    form.value.salaryMin = null
+    form.value.salaryMax = null
+    form.value.salaryCurrency = ''
+    form.value.salaryUnit = ''
+  }
+})
+
 // ─────────────────────────────────────────────
 // Validation
 // ─────────────────────────────────────────────
@@ -76,10 +88,11 @@ const editSchema = z.object({
   location: z.string().optional(),
   type: z.enum(['full_time', 'part_time', 'contract', 'internship']),
   slug: z.string().max(80).optional(),
-  salaryMin: z.coerce.number().int().min(0).optional(),
-  salaryMax: z.coerce.number().int().min(0).optional(),
+  salaryMin: z.union([z.coerce.number().int().min(0), z.null()]).optional(),
+  salaryMax: z.union([z.coerce.number().int().min(0), z.null()]).optional(),
   salaryCurrency: z.string().length(3).optional().or(z.literal('')),
   salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).optional().or(z.literal('')),
+  salaryNegotiable: z.boolean().optional(),
   remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).optional().or(z.literal('')),
   validThrough: z.string().optional(),
   requireResume: z.boolean().optional(),
@@ -107,22 +120,24 @@ async function handleSave() {
   try {
     const payload: Record<string, unknown> = {
       title: form.value.title,
-      description: form.value.description || undefined,
-      location: form.value.location || undefined,
+      description: form.value.description || null,
+      location: form.value.location || null,
       type: form.value.type,
       slug: form.value.slug || undefined,
       requireResume: form.value.requireResume,
       requireCoverLetter: form.value.requireCoverLetter,
       autoScoreOnApply: form.value.autoScoreOnApply,
+      salaryNegotiable: form.value.salaryNegotiable,
+      // Always send salary fields so cleared values write null to the DB
+      salaryMin: form.value.salaryNegotiable ? null : (form.value.salaryMin ?? null),
+      salaryMax: form.value.salaryNegotiable ? null : (form.value.salaryMax ?? null),
+      salaryCurrency: form.value.salaryNegotiable ? null : (form.value.salaryCurrency || null),
+      salaryUnit: form.value.salaryNegotiable ? null : (form.value.salaryUnit || null),
+      remoteStatus: form.value.remoteStatus || null,
+      // Send null when cleared so the DB column is set to NULL
+      validThrough: form.value.validThrough ? new Date(form.value.validThrough) : null,
     }
 
-    if (form.value.salaryMin != null && form.value.salaryMin > 0) payload.salaryMin = form.value.salaryMin
-    if (form.value.salaryMax != null && form.value.salaryMax > 0) payload.salaryMax = form.value.salaryMax
-    if (form.value.salaryCurrency) payload.salaryCurrency = form.value.salaryCurrency
-    if (form.value.salaryUnit) payload.salaryUnit = form.value.salaryUnit
-    if (form.value.remoteStatus) payload.remoteStatus = form.value.remoteStatus
-    if (form.value.validThrough) payload.validThrough = new Date(form.value.validThrough)
-
     await updateJob(payload as any)
     track('job_settings_saved', { job_id: jobId })
     saved.value = true
@@ -338,63 +353,83 @@ const salaryUnitOptions = [
             Adding salary information improves visibility on Google Jobs.
           </p>
           <div class="space-y-4">
-            <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-              <div>
-                <label for="settings-salary-min" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-                  Minimum Salary
-                </label>
-                <input
-                  id="settings-salary-min"
-                  v-model.number="form.salaryMin"
-                  type="number"
-                  min="0"
-                  placeholder="e.g. 50000"
-                  class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-                />
-              </div>
+            <!-- Negotiable toggle -->
+            <label class="flex items-center gap-3 cursor-pointer">
+              <input
+                v-model="form.salaryNegotiable"
+                type="checkbox"
+                class="size-4 rounded border-surface-300 dark:border-surface-600 text-brand-600 focus:ring-brand-500"
+              />
               <div>
-                <label for="settings-salary-max" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-                  Maximum Salary
-                </label>
-                <input
-                  id="settings-salary-max"
-                  v-model.number="form.salaryMax"
-                  type="number"
-                  min="0"
-                  placeholder="e.g. 80000"
-                  class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-                />
+                <span class="text-sm font-medium text-surface-900 dark:text-surface-100">Salary is negotiable</span>
+                <p class="text-xs text-surface-400 dark:text-surface-500">
+                  When checked, "Negotiable" is shown instead of a specific salary range. Salary fields below will be cleared.
+                </p>
               </div>
-            </div>
-            <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-              <div>
-                <label for="settings-currency" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-                  Currency
-                </label>
-                <input
-                  id="settings-currency"
-                  v-model="form.salaryCurrency"
-                  type="text"
-                  maxlength="3"
-                  placeholder="e.g. USD, EUR, NOK"
-                  class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors uppercase"
-                />
+            </label>
+
+            <!-- Salary range fields — hidden when negotiable -->
+            <template v-if="!form.salaryNegotiable">
+              <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                <div>
+                  <label for="settings-salary-min" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                    Minimum Salary
+                  </label>
+                  <input
+                    id="settings-salary-min"
+                    v-model.number="form.salaryMin"
+                    type="number"
+                    min="0"
+                    placeholder="e.g. 50000"
+                    class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+                    @change="if (!($event.target as HTMLInputElement).value) form.salaryMin = null"
+                  />
+                </div>
+                <div>
+                  <label for="settings-salary-max" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                    Maximum Salary
+                  </label>
+                  <input
+                    id="settings-salary-max"
+                    v-model.number="form.salaryMax"
+                    type="number"
+                    min="0"
+                    placeholder="e.g. 80000"
+                    class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+                    @change="if (!($event.target as HTMLInputElement).value) form.salaryMax = null"
+                  />
+                </div>
               </div>
-              <div>
-                <label for="settings-salary-unit" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-                  Pay Period
-                </label>
-                <select
-                  id="settings-salary-unit"
-                  v-model="form.salaryUnit"
-                  class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-                >
-                  <option v-for="opt in salaryUnitOptions" :key="opt.value" :value="opt.value">
-                    {{ opt.label }}
-                  </option>
-                </select>
+              <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                <div>
+                  <label for="settings-currency" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                    Currency
+                  </label>
+                  <input
+                    id="settings-currency"
+                    v-model="form.salaryCurrency"
+                    type="text"
+                    maxlength="3"
+                    placeholder="e.g. USD, EUR, NOK"
+                    class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors uppercase"
+                  />
+                </div>
+                <div>
+                  <label for="settings-salary-unit" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                    Pay Period
+                  </label>
+                  <select
+                    id="settings-salary-unit"
+                    v-model="form.salaryUnit"
+                    class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+                  >
+                    <option v-for="opt in salaryUnitOptions" :key="opt.value" :value="opt.value">
+                      {{ opt.label }}
+                    </option>
+                  </select>
+                </div>
               </div>
-            </div>
+            </template>
           </div>
         </section>
 
@@ -455,12 +490,23 @@ const salaryUnitOptions = [
             <label for="settings-valid-through" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
               Valid Through
             </label>
-            <input
-              id="settings-valid-through"
-              v-model="form.validThrough"
-              type="date"
-              class="w-full sm:w-64 rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-            />
+            <div class="flex items-center gap-2">
+              <input
+                id="settings-valid-through"
+                v-model="form.validThrough"
+                type="date"
+                class="w-full sm:w-64 rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+              />
+              <button
+                v-if="form.validThrough"
+                type="button"
+                class="text-xs text-surface-400 hover:text-danger-500 dark:hover:text-danger-400 transition-colors underline shrink-0"
+                @click="form.validThrough = ''"
+              >
+                Clear
+              </button>
+            </div>
+            <p class="mt-1.5 text-xs text-surface-400 dark:text-surface-500">Leave blank if there is no fixed expiry date.</p>
           </div>
         </section>
 
diff --git a/app/pages/dashboard/jobs/new.vue b/app/pages/dashboard/jobs/new.vue
index 3c52559..56bc7e4 100644
--- a/app/pages/dashboard/jobs/new.vue
+++ b/app/pages/dashboard/jobs/new.vue
@@ -315,6 +315,41 @@ onMounted(() => {
   restoreFormFromStorage()
 })
 
+// Reset all wizard state to initial values (called when user clicks "New Job" again)
+function resetState() {
+  currentStep.value = 1
+  form.value = {
+    title: '',
+    description: '',
+    location: '',
+    type: 'full_time',
+    experienceLevel: 'mid',
+    remoteStatus: undefined,
+  }
+  applicationForm.value = {
+    requireResume: true,
+    requireCoverLetter: false,
+    questions: [],
+  }
+  scoringCriteria.value = []
+  scoringMode.value = 'none'
+  autoScoreOnApply.value = false
+  isPublished.value = false
+  createdJobId.value = ''
+  createdJobSlug.value = ''
+  finalApplicationLink.value = ''
+  errors.value = {}
+  createdLinks.value = {}
+  customBoardLinks.value = []
+  clearFormStorage()
+}
+
+// Shared signal incremented by AppTopBar when the user is already on this page
+const newJobResetSignal = useState('new-job-reset-signal', () => 0)
+watch(newJobResetSignal, (next, prev) => {
+  if (next > prev) resetState()
+})
+
 // Auto-save when step changes or form data changes
 watch([currentStep, form, applicationForm, scoringCriteria, scoringMode, autoScoreOnApply], () => {
   saveFormToStorage()
@@ -485,8 +520,11 @@ function validateStep1(): boolean {
   return true
 }
 
+// Pure check with no side-effects so it never populates errors on its own
+const isStep1Valid = computed(() => formSchema.safeParse(form.value).success)
+
 const canGoNext = computed(() => {
-  if (currentStep.value === 1) return validateStep1()
+  if (currentStep.value === 1) return isStep1Valid.value
   return true
 })
 
@@ -742,7 +780,7 @@ const questionTypeLabels: Record<QuestionType, string> = {
     <div class="flex flex-col md:flex-row md:items-center justify-between gap-4 mb-8">
       <div>
         <NuxtLink
-          :to="$localePath('/dashboard')"
+          :to="$localePath('/dashboard/jobs')"
           class="inline-flex items-center gap-1 text-sm text-surface-500 dark:text-surface-400 hover:text-surface-700 dark:hover:text-surface-200 mb-2 transition-colors"
         >
           <ArrowLeft class="size-4" />
@@ -833,6 +871,7 @@ const questionTypeLabels: Record<QuestionType, string> = {
                     placeholder="e.g. Senior Frontend Engineer"
                     class="w-full rounded-lg border px-3 py-2.5 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
                     :class="errors.title ? 'border-danger-300 ring-1 ring-danger-100' : 'border-surface-300 dark:border-surface-700'"
+                    @blur="validateStep1"
                   />
                   <p v-if="errors.title" class="mt-1.5 text-xs text-danger-600 dark:text-danger-400 font-medium">{{ errors.title }}</p>
                   <p v-else class="mt-1.5 text-xs text-surface-500">80 characters left. No special characters.</p>
diff --git a/app/pages/dashboard/settings/localization.vue b/app/pages/dashboard/settings/localization.vue
new file mode 100644
index 0000000..8ddbbee
--- /dev/null
+++ b/app/pages/dashboard/settings/localization.vue
@@ -0,0 +1,252 @@
+<script setup lang="ts">
+import { Globe, Save, Check, Loader2 } from 'lucide-vue-next'
+
+definePageMeta({})
+
+useSeoMeta({
+  title: 'Localization Settings — Reqcore',
+  description: 'Configure name display format and date format for your organization',
+})
+
+const { allowed: canUpdateOrg } = usePermission({ organization: ['update'] })
+const { nameDisplayFormat, dateFormat, updateSettings } = useOrgSettings()
+const { track } = useTrack()
+
+const localNameFormat = ref<'first_last' | 'last_first'>('first_last')
+const localDateFormat = ref<'mdy' | 'dmy' | 'ymd'>('mdy')
+
+// Sync from loaded settings
+watch([nameDisplayFormat, dateFormat], ([nf, df]) => {
+  localNameFormat.value = nf as 'first_last' | 'last_first'
+  localDateFormat.value = df as 'mdy' | 'dmy' | 'ymd'
+}, { immediate: true })
+
+const isSaving = ref(false)
+const saveSuccess = ref(false)
+const saveError = ref('')
+
+async function handleSave() {
+  if (!canUpdateOrg.value) return
+  isSaving.value = true
+  saveError.value = ''
+  saveSuccess.value = false
+
+  try {
+    await updateSettings({
+      nameDisplayFormat: localNameFormat.value,
+      dateFormat: localDateFormat.value,
+    })
+    track('localization_settings_saved')
+    saveSuccess.value = true
+    setTimeout(() => { saveSuccess.value = false }, 3000)
+  }
+  catch (err: unknown) {
+    saveError.value = err instanceof Error ? err.message : 'Failed to save settings'
+  }
+  finally {
+    isSaving.value = false
+  }
+}
+
+// Preview helpers
+const previewCandidate = { firstName: 'Jane', lastName: 'Doe', displayName: null }
+const previewNameFormatted = computed(() => {
+  if (localNameFormat.value === 'last_first') return `${previewCandidate.lastName} ${previewCandidate.firstName}`
+  return `${previewCandidate.firstName} ${previewCandidate.lastName}`
+})
+
+const previewDate = '1990-05-24'
+const previewDateFormatted = computed(() => {
+  const [year, month, day] = previewDate.split('-')
+  switch (localDateFormat.value) {
+    case 'dmy': return `${day}/${month}/${year}`
+    case 'ymd': return `${year}-${month}-${day}`
+    case 'mdy':
+    default: return `${month}/${day}/${year}`
+  }
+})
+</script>
+
+<template>
+  <div class="mx-auto max-w-2xl">
+    <!-- Page title -->
+    <div class="mb-6">
+      <h1 class="text-lg font-semibold text-surface-900 dark:text-surface-50">
+        Localization
+      </h1>
+      <p class="text-sm text-surface-500 dark:text-surface-400 mt-0.5">
+        Configure how candidate names and dates are displayed across your organization.
+      </p>
+    </div>
+
+    <!-- Settings card -->
+    <section class="rounded-xl border border-surface-200 dark:border-surface-800 bg-white dark:bg-surface-900 overflow-hidden">
+      <div class="px-4 sm:px-6 py-5 border-b border-surface-200 dark:border-surface-800">
+        <div class="flex items-center gap-3">
+          <div class="flex items-center justify-center size-10 shrink-0 rounded-lg bg-brand-50 dark:bg-brand-950 text-brand-600 dark:text-brand-400">
+            <Globe class="size-5" />
+          </div>
+          <div>
+            <h2 class="text-base font-semibold text-surface-900 dark:text-surface-100">Display preferences</h2>
+            <p class="text-sm text-surface-500 dark:text-surface-400">Controls name and date formatting for all members of this organization.</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="px-4 sm:px-6 py-5 space-y-6">
+        <!-- Name display format -->
+        <div>
+          <label class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-2">
+            Name display format
+          </label>
+          <p class="text-xs text-surface-400 dark:text-surface-500 mb-3">
+            Choose how candidate names are displayed throughout the application. You can always override this on individual candidates using the Display Name field.
+          </p>
+          <div class="flex flex-col sm:flex-row gap-3">
+            <label
+              class="flex items-start gap-3 flex-1 rounded-lg border p-3.5 cursor-pointer transition-colors"
+              :class="localNameFormat === 'first_last'
+                ? 'border-brand-500 bg-brand-50/50 dark:bg-brand-950/30 dark:border-brand-600'
+                : 'border-surface-200 dark:border-surface-700 hover:border-surface-300 dark:hover:border-surface-600'"
+            >
+              <input
+                v-model="localNameFormat"
+                type="radio"
+                value="first_last"
+                class="mt-0.5 accent-brand-600"
+                :disabled="!canUpdateOrg"
+              />
+              <div>
+                <span class="block text-sm font-medium text-surface-800 dark:text-surface-200">First Last</span>
+                <span class="block text-xs text-surface-400 mt-0.5">e.g. Jane Doe</span>
+              </div>
+            </label>
+            <label
+              class="flex items-start gap-3 flex-1 rounded-lg border p-3.5 cursor-pointer transition-colors"
+              :class="localNameFormat === 'last_first'
+                ? 'border-brand-500 bg-brand-50/50 dark:bg-brand-950/30 dark:border-brand-600'
+                : 'border-surface-200 dark:border-surface-700 hover:border-surface-300 dark:hover:border-surface-600'"
+            >
+              <input
+                v-model="localNameFormat"
+                type="radio"
+                value="last_first"
+                class="mt-0.5 accent-brand-600"
+                :disabled="!canUpdateOrg"
+              />
+              <div>
+                <span class="block text-sm font-medium text-surface-800 dark:text-surface-200">Last First</span>
+                <span class="block text-xs text-surface-400 mt-0.5">e.g. Doe Jane</span>
+              </div>
+            </label>
+          </div>
+        </div>
+
+        <!-- Date format -->
+        <div>
+          <label class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-2">
+            Date format
+          </label>
+          <p class="text-xs text-surface-400 dark:text-surface-500 mb-3">
+            Controls how dates (e.g. date of birth) are displayed.
+          </p>
+          <div class="flex flex-col sm:flex-row gap-3">
+            <label
+              class="flex items-start gap-3 flex-1 rounded-lg border p-3.5 cursor-pointer transition-colors"
+              :class="localDateFormat === 'mdy'
+                ? 'border-brand-500 bg-brand-50/50 dark:bg-brand-950/30 dark:border-brand-600'
+                : 'border-surface-200 dark:border-surface-700 hover:border-surface-300 dark:hover:border-surface-600'"
+            >
+              <input
+                v-model="localDateFormat"
+                type="radio"
+                value="mdy"
+                class="mt-0.5 accent-brand-600"
+                :disabled="!canUpdateOrg"
+              />
+              <div>
+                <span class="block text-sm font-medium text-surface-800 dark:text-surface-200">MM/DD/YYYY</span>
+                <span class="block text-xs text-surface-400 mt-0.5">United States</span>
+              </div>
+            </label>
+            <label
+              class="flex items-start gap-3 flex-1 rounded-lg border p-3.5 cursor-pointer transition-colors"
+              :class="localDateFormat === 'dmy'
+                ? 'border-brand-500 bg-brand-50/50 dark:bg-brand-950/30 dark:border-brand-600'
+                : 'border-surface-200 dark:border-surface-700 hover:border-surface-300 dark:hover:border-surface-600'"
+            >
+              <input
+                v-model="localDateFormat"
+                type="radio"
+                value="dmy"
+                class="mt-0.5 accent-brand-600"
+                :disabled="!canUpdateOrg"
+              />
+              <div>
+                <span class="block text-sm font-medium text-surface-800 dark:text-surface-200">DD/MM/YYYY</span>
+                <span class="block text-xs text-surface-400 mt-0.5">Europe, Vietnam & most regions</span>
+              </div>
+            </label>
+            <label
+              class="flex items-start gap-3 flex-1 rounded-lg border p-3.5 cursor-pointer transition-colors"
+              :class="localDateFormat === 'ymd'
+                ? 'border-brand-500 bg-brand-50/50 dark:bg-brand-950/30 dark:border-brand-600'
+                : 'border-surface-200 dark:border-surface-700 hover:border-surface-300 dark:hover:border-surface-600'"
+            >
+              <input
+                v-model="localDateFormat"
+                type="radio"
+                value="ymd"
+                class="mt-0.5 accent-brand-600"
+                :disabled="!canUpdateOrg"
+              />
+              <div>
+                <span class="block text-sm font-medium text-surface-800 dark:text-surface-200">YYYY-MM-DD</span>
+                <span class="block text-xs text-surface-400 mt-0.5">ISO 8601 / East Asia</span>
+              </div>
+            </label>
+          </div>
+        </div>
+
+        <!-- Live preview -->
+        <div class="rounded-lg border border-surface-200 dark:border-surface-700 bg-surface-50 dark:bg-surface-800/50 p-4">
+          <p class="text-xs font-medium text-surface-500 dark:text-surface-400 uppercase tracking-wide mb-2">Preview</p>
+          <div class="flex flex-col sm:flex-row sm:items-center gap-3 text-sm">
+            <div class="flex items-center gap-2">
+              <span class="text-surface-400">Name:</span>
+              <span class="font-medium text-surface-900 dark:text-surface-100">{{ previewNameFormatted }}</span>
+            </div>
+            <div class="hidden sm:block text-surface-300 dark:text-surface-600">·</div>
+            <div class="flex items-center gap-2">
+              <span class="text-surface-400">Date of Birth:</span>
+              <span class="font-medium text-surface-900 dark:text-surface-100">{{ previewDateFormatted }}</span>
+            </div>
+          </div>
+        </div>
+
+        <!-- Error -->
+        <div
+          v-if="saveError"
+          class="rounded-lg border border-danger-200 dark:border-danger-800 bg-danger-50 dark:bg-danger-950 px-4 py-3 text-sm text-danger-700 dark:text-danger-400"
+        >
+          {{ saveError }}
+        </div>
+
+        <!-- Save button -->
+        <div class="flex items-center gap-3">
+          <button
+            :disabled="!canUpdateOrg || isSaving"
+            class="inline-flex items-center gap-2 rounded-lg bg-brand-600 px-4 py-2 text-sm font-medium text-white hover:bg-brand-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+            @click="handleSave"
+          >
+            <Check v-if="saveSuccess" class="size-4" />
+            <Loader2 v-else-if="isSaving" class="size-4 animate-spin" />
+            <Save v-else class="size-4" />
+            {{ saveSuccess ? 'Saved!' : isSaving ? 'Saving…' : 'Save changes' }}
+          </button>
+          <p v-if="!canUpdateOrg" class="text-xs text-surface-400">Only admins and owners can change organization settings.</p>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
diff --git a/app/pages/jobs/[slug]/index.vue b/app/pages/jobs/[slug]/index.vue
index a8320db..7331003 100644
--- a/app/pages/jobs/[slug]/index.vue
+++ b/app/pages/jobs/[slug]/index.vue
@@ -280,10 +280,10 @@ function formatSalary(min?: number | null, max?: number | null, currency?: strin
               {{ job.location }}
             </span>
             <span
-              v-if="formatSalary(job.salaryMin, job.salaryMax, job.salaryCurrency, job.salaryUnit)"
+              v-if="job.salaryNegotiable || formatSalary(job.salaryMin, job.salaryMax, job.salaryCurrency, job.salaryUnit)"
               class="inline-flex items-center gap-1.5 rounded-full border border-success-200 dark:border-success-800 bg-success-50 dark:bg-success-950 px-3 py-1 text-xs font-semibold text-success-700 dark:text-success-300"
             >
-              {{ formatSalary(job.salaryMin, job.salaryMax, job.salaryCurrency, job.salaryUnit) }}
+              {{ job.salaryNegotiable ? 'Negotiable' : formatSalary(job.salaryMin, job.salaryMax, job.salaryCurrency, job.salaryUnit) }}
             </span>
           </div>
 
diff --git a/package-lock.json b/package-lock.json
index f2571f2..d406ef5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
         "googleapis": "^171.4.0",
         "lucide-vue-next": "^0.577.0",
         "mammoth": "^1.12.0",
+        "nodemailer": "^8.0.5",
         "nuxt": "^4.3.1",
         "pdf-parse": "^2.4.5",
         "postgres": "^3.4.8",
@@ -46,6 +47,7 @@
         "@crowdin/cli": "^4.14.0",
         "@playwright/test": "^1.58.2",
         "@types/node": "^25.2.3",
+        "@types/nodemailer": "^8.0.0",
         "@types/pdf-parse": "^1.1.5",
         "commander": "^13.1.0",
         "drizzle-kit": "^0.31.9",
@@ -7077,6 +7079,16 @@
         "undici-types": "~7.18.0"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-8.0.0.tgz",
+      "integrity": "sha512-fyf8jWULsCo0d0BuoQ75i6IeoHs47qcqxWc7yUdUcV0pOZGjUTTOvwdG1PRXUDqN/8A64yQdQdnA2pZgcdi+cA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/pdf-parse": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/@types/pdf-parse/-/pdf-parse-1.1.5.tgz",
@@ -14036,6 +14048,15 @@
         "asn1": "^0.2.4"
       }
     },
+    "node_modules/nodemailer": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.5.tgz",
+      "integrity": "sha512-0PF8Yb1yZuQfQbq+5/pZJrtF6WQcjTd5/S4JOHs9PGFxuTqoB/icwuB44pOdURHJbRKX1PPoJZtY7R4VUoCC8w==",
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/nopt": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
diff --git a/package.json b/package.json
index 3ff7709..54d2d51 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "googleapis": "^171.4.0",
     "lucide-vue-next": "^0.577.0",
     "mammoth": "^1.12.0",
+    "nodemailer": "^8.0.5",
     "nuxt": "^4.3.1",
     "pdf-parse": "^2.4.5",
     "postgres": "^3.4.8",
@@ -60,6 +61,7 @@
     "@crowdin/cli": "^4.14.0",
     "@playwright/test": "^1.58.2",
     "@types/node": "^25.2.3",
+    "@types/nodemailer": "^8.0.0",
     "@types/pdf-parse": "^1.1.5",
     "commander": "^13.1.0",
     "drizzle-kit": "^0.31.9",
diff --git a/server/api/candidates/[id].get.ts b/server/api/candidates/[id].get.ts
index c481b78..9ee946b 100644
--- a/server/api/candidates/[id].get.ts
+++ b/server/api/candidates/[id].get.ts
@@ -10,6 +10,18 @@ export default defineEventHandler(async (event) => {
 
   const result = await db.query.candidate.findFirst({
     where: and(eq(candidate.id, id), eq(candidate.organizationId, orgId)),
+    columns: {
+      id: true,
+      firstName: true,
+      lastName: true,
+      displayName: true,
+      email: true,
+      phone: true,
+      gender: true,
+      dateOfBirth: true,
+      createdAt: true,
+      updatedAt: true,
+    },
     with: {
       applications: {
         columns: { id: true, status: true, createdAt: true },
diff --git a/server/api/candidates/[id].patch.ts b/server/api/candidates/[id].patch.ts
index 3f5056a..37ca4e4 100644
--- a/server/api/candidates/[id].patch.ts
+++ b/server/api/candidates/[id].patch.ts
@@ -34,8 +34,11 @@ export default defineEventHandler(async (event) => {
       id: candidate.id,
       firstName: candidate.firstName,
       lastName: candidate.lastName,
+      displayName: candidate.displayName,
       email: candidate.email,
       phone: candidate.phone,
+      gender: candidate.gender,
+      dateOfBirth: candidate.dateOfBirth,
       createdAt: candidate.createdAt,
       updatedAt: candidate.updatedAt,
     })
diff --git a/server/api/candidates/index.get.ts b/server/api/candidates/index.get.ts
index 00479c0..1eccf6a 100644
--- a/server/api/candidates/index.get.ts
+++ b/server/api/candidates/index.get.ts
@@ -24,6 +24,10 @@ export default defineEventHandler(async (event) => {
     )
   }
 
+  if (query.gender) {
+    conditions.push(eq(candidate.gender, query.gender))
+  }
+
   const where = and(...conditions)
 
   const [data, total] = await Promise.all([
@@ -32,8 +36,11 @@ export default defineEventHandler(async (event) => {
         id: candidate.id,
         firstName: candidate.firstName,
         lastName: candidate.lastName,
+        displayName: candidate.displayName,
         email: candidate.email,
         phone: candidate.phone,
+        gender: candidate.gender,
+        dateOfBirth: candidate.dateOfBirth,
         createdAt: candidate.createdAt,
         updatedAt: candidate.updatedAt,
         applicationCount: sql<number>`count(${application.id})::int`,
diff --git a/server/api/candidates/index.post.ts b/server/api/candidates/index.post.ts
index d695ecd..c74d2bc 100644
--- a/server/api/candidates/index.post.ts
+++ b/server/api/candidates/index.post.ts
@@ -28,14 +28,20 @@ export default defineEventHandler(async (event) => {
     organizationId: orgId,
     firstName: body.firstName,
     lastName: body.lastName,
+    displayName: body.displayName ?? null,
     email: body.email,
     phone: body.phone,
+    gender: body.gender ?? null,
+    dateOfBirth: body.dateOfBirth ?? null,
   }).returning({
     id: candidate.id,
     firstName: candidate.firstName,
     lastName: candidate.lastName,
+    displayName: candidate.displayName,
     email: candidate.email,
     phone: candidate.phone,
+    gender: candidate.gender,
+    dateOfBirth: candidate.dateOfBirth,
     createdAt: candidate.createdAt,
     updatedAt: candidate.updatedAt,
   })
diff --git a/server/api/interviews/[id]/send-invitation.post.ts b/server/api/interviews/[id]/send-invitation.post.ts
index 6279b96..0c8ffb4 100644
--- a/server/api/interviews/[id]/send-invitation.post.ts
+++ b/server/api/interviews/[id]/send-invitation.post.ts
@@ -2,7 +2,7 @@ import { and, eq } from 'drizzle-orm'
 import { interview, application, candidate, job, emailTemplate, organization } from '../../../database/schema'
 import { interviewIdParamSchema } from '../../../utils/schemas/interview'
 import { sendInterviewInvitationSchema, SYSTEM_TEMPLATES } from '../../../utils/schemas/emailTemplate'
-import { sendInterviewInvitationEmail, renderTemplate, type InterviewEmailData } from '../../../utils/email'
+import { sendInterviewInvitationEmail, renderTemplate, getFromEmail, type InterviewEmailData } from '../../../utils/email'
 import { generateInterviewICS } from '../../../utils/ical'
 import { buildResponseUrls } from '../../../utils/interview-token'
 
@@ -106,10 +106,7 @@ export default defineEventHandler(async (event) => {
   // Build template data
   const scheduledAt = new Date(interviewRecord.scheduledAt)
   const candidateName = `${app.candidate.firstName} ${app.candidate.lastName}`
-  const fromEmail = env.RESEND_FROM_EMAIL
-  if (!fromEmail) {
-    throw createError({ statusCode: 503, statusMessage: 'Email sending is not configured (RESEND_FROM_EMAIL missing)' })
-  }
+  const fromEmail = getFromEmail()
 
   // Derive the base URL for response links
   const baseUrl = env.BETTER_AUTH_URL
diff --git a/server/api/jobs/[id].get.ts b/server/api/jobs/[id].get.ts
index 5351719..28481db 100644
--- a/server/api/jobs/[id].get.ts
+++ b/server/api/jobs/[id].get.ts
@@ -22,6 +22,7 @@ export default defineEventHandler(async (event) => {
       salaryMax: true,
       salaryCurrency: true,
       salaryUnit: true,
+      salaryNegotiable: true,
       remoteStatus: true,
       validThrough: true,
       requireResume: true,
diff --git a/server/api/jobs/[id].patch.ts b/server/api/jobs/[id].patch.ts
index 1e7976f..beb874e 100644
--- a/server/api/jobs/[id].patch.ts
+++ b/server/api/jobs/[id].patch.ts
@@ -52,6 +52,7 @@ export default defineEventHandler(async (event) => {
       salaryMax: job.salaryMax,
       salaryCurrency: job.salaryCurrency,
       salaryUnit: job.salaryUnit,
+      salaryNegotiable: job.salaryNegotiable,
       remoteStatus: job.remoteStatus,
       validThrough: job.validThrough,
       requireResume: job.requireResume,
diff --git a/server/api/jobs/index.post.ts b/server/api/jobs/index.post.ts
index 91025cc..0827348 100644
--- a/server/api/jobs/index.post.ts
+++ b/server/api/jobs/index.post.ts
@@ -23,6 +23,7 @@ export default defineEventHandler(async (event) => {
     salaryMax: body.salaryMax,
     salaryCurrency: body.salaryCurrency,
     salaryUnit: body.salaryUnit,
+    salaryNegotiable: body.salaryNegotiable,
     remoteStatus: body.remoteStatus,
     validThrough: body.validThrough,
     requireResume: body.requireResume,
@@ -40,6 +41,7 @@ export default defineEventHandler(async (event) => {
     salaryMax: job.salaryMax,
     salaryCurrency: job.salaryCurrency,
     salaryUnit: job.salaryUnit,
+    salaryNegotiable: job.salaryNegotiable,
     remoteStatus: job.remoteStatus,
     validThrough: job.validThrough,
     requireResume: job.requireResume,
diff --git a/server/api/org-settings/index.get.ts b/server/api/org-settings/index.get.ts
new file mode 100644
index 0000000..7448945
--- /dev/null
+++ b/server/api/org-settings/index.get.ts
@@ -0,0 +1,21 @@
+import { eq } from 'drizzle-orm'
+import { orgSettings } from '../../database/schema'
+
+export default defineEventHandler(async (event) => {
+  const session = await requirePermission(event, { organization: ['read'] })
+  const orgId = session.session.activeOrganizationId
+
+  const settings = await db.query.orgSettings.findFirst({
+    where: eq(orgSettings.organizationId, orgId),
+    columns: {
+      nameDisplayFormat: true,
+      dateFormat: true,
+    },
+  })
+
+  // Return defaults if no settings row exists yet
+  return {
+    nameDisplayFormat: settings?.nameDisplayFormat ?? 'first_last',
+    dateFormat: settings?.dateFormat ?? 'mdy',
+  }
+})
diff --git a/server/api/org-settings/index.patch.ts b/server/api/org-settings/index.patch.ts
new file mode 100644
index 0000000..8f544fa
--- /dev/null
+++ b/server/api/org-settings/index.patch.ts
@@ -0,0 +1,39 @@
+import { eq } from 'drizzle-orm'
+import { orgSettings } from '../../database/schema'
+import { updateOrgSettingsSchema } from '../../utils/schemas/orgSettings'
+
+export default defineEventHandler(async (event) => {
+  const session = await requirePermission(event, { organization: ['update'] })
+  const orgId = session.session.activeOrganizationId
+
+  const body = await readValidatedBody(event, updateOrgSettingsSchema.parse)
+
+  // Upsert: insert or update on conflict
+  const [result] = await db
+    .insert(orgSettings)
+    .values({
+      organizationId: orgId,
+      nameDisplayFormat: body.nameDisplayFormat ?? 'first_last',
+      dateFormat: body.dateFormat ?? 'mdy',
+    })
+    .onConflictDoUpdate({
+      target: orgSettings.organizationId,
+      set: {
+        ...(body.nameDisplayFormat !== undefined && { nameDisplayFormat: body.nameDisplayFormat }),
+        ...(body.dateFormat !== undefined && { dateFormat: body.dateFormat }),
+        updatedAt: new Date(),
+      },
+    })
+    .returning({
+      nameDisplayFormat: orgSettings.nameDisplayFormat,
+      dateFormat: orgSettings.dateFormat,
+    })
+
+  if (!result) {
+    throw createError({ statusCode: 500, statusMessage: 'Failed to save settings' })
+  }
+
+  logApiRequest(event, session, 'org_settings.updated', {})
+
+  return result
+})
diff --git a/server/api/public/jobs/[slug].get.ts b/server/api/public/jobs/[slug].get.ts
index f2b8141..8c1dea0 100644
--- a/server/api/public/jobs/[slug].get.ts
+++ b/server/api/public/jobs/[slug].get.ts
@@ -25,6 +25,7 @@ export default defineEventHandler(async (event) => {
       salaryMax: true,
       salaryCurrency: true,
       salaryUnit: true,
+      salaryNegotiable: true,
       remoteStatus: true,
       validThrough: true,
       requireResume: true,
diff --git a/server/database/migrations/0021_candidate_demographics_org_settings.sql b/server/database/migrations/0021_candidate_demographics_org_settings.sql
new file mode 100644
index 0000000..6f55a2e
--- /dev/null
+++ b/server/database/migrations/0021_candidate_demographics_org_settings.sql
@@ -0,0 +1,38 @@
+-- Migration: Add candidate demographics (gender, date_of_birth, display_name) and org_settings table
+-- ──────────────────────────────────────────────────────────────────────────────────────────────────
+
+-- New enums
+CREATE TYPE "gender" AS ENUM('male', 'female', 'other', 'prefer_not_to_say');
+--> statement-breakpoint
+CREATE TYPE "name_display_format" AS ENUM('first_last', 'last_first');
+--> statement-breakpoint
+CREATE TYPE "date_format" AS ENUM('mdy', 'dmy', 'ymd');
+--> statement-breakpoint
+
+-- New columns on candidate table
+ALTER TABLE "candidate" ADD COLUMN "display_name" text;
+--> statement-breakpoint
+ALTER TABLE "candidate" ADD COLUMN "gender" "gender";
+--> statement-breakpoint
+ALTER TABLE "candidate" ADD COLUMN "date_of_birth" text;
+--> statement-breakpoint
+
+-- Index on gender for filtering
+CREATE INDEX "candidate_gender_idx" ON "candidate" USING btree ("organization_id", "gender");
+--> statement-breakpoint
+
+-- org_settings table
+CREATE TABLE "org_settings" (
+	"id" text PRIMARY KEY NOT NULL,
+	"organization_id" text NOT NULL,
+	"name_display_format" "name_display_format" NOT NULL DEFAULT 'first_last',
+	"date_format" "date_format" NOT NULL DEFAULT 'mdy',
+	"created_at" timestamp NOT NULL DEFAULT now(),
+	"updated_at" timestamp NOT NULL DEFAULT now()
+);
+--> statement-breakpoint
+
+ALTER TABLE "org_settings" ADD CONSTRAINT "org_settings_organization_id_fkey" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;
+--> statement-breakpoint
+
+CREATE UNIQUE INDEX "org_settings_organization_id_idx" ON "org_settings" USING btree ("organization_id");
diff --git a/server/database/migrations/0022_salary_negotiable.sql b/server/database/migrations/0022_salary_negotiable.sql
new file mode 100644
index 0000000..6baac81
--- /dev/null
+++ b/server/database/migrations/0022_salary_negotiable.sql
@@ -0,0 +1,7 @@
+-- Migration: Add salary_negotiable flag to the job table
+-- This supports the "Negotiable" toggle in Job Settings (Salary & Compensation).
+-- When true, salary range fields are hidden/optional and the public listing
+-- shows "Negotiable" instead of a specific range.
+-- ──────────────────────────────────────────────────────────────────────────────
+
+ALTER TABLE "job" ADD COLUMN "salary_negotiable" boolean NOT NULL DEFAULT false;
diff --git a/server/database/schema/app.ts b/server/database/schema/app.ts
index 509ce5b..0b0cb8d 100644
--- a/server/database/schema/app.ts
+++ b/server/database/schema/app.ts
@@ -27,6 +27,9 @@ export const questionTypeEnum = pgEnum('question_type', [
   'short_text', 'long_text', 'single_select', 'multi_select',
   'number', 'date', 'url', 'checkbox', 'file_upload',
 ])
+export const genderEnum = pgEnum('gender', ['male', 'female', 'other', 'prefer_not_to_say'])
+export const nameDisplayFormatEnum = pgEnum('name_display_format', ['first_last', 'last_first'])
+export const dateFormatEnum = pgEnum('date_format', ['mdy', 'dmy', 'ymd'])
 
 // ─────────────────────────────────────────────
 // ATS Domain Tables — ALL scoped by organizationId
@@ -49,6 +52,7 @@ export const job = pgTable('job', {
   salaryMax: integer('salary_max'),
   salaryCurrency: text('salary_currency'),
   salaryUnit: text('salary_unit'),
+  salaryNegotiable: boolean('salary_negotiable').notNull().default(false),
   remoteStatus: text('remote_status'),
   validThrough: timestamp('valid_through'),
   // ── Application form settings ──
@@ -71,12 +75,19 @@ export const candidate = pgTable('candidate', {
   organizationId: text('organization_id').notNull().references(() => organization.id, { onDelete: 'cascade' }),
   firstName: text('first_name').notNull(),
   lastName: text('last_name').notNull(),
+  /** Optional display name override (e.g. for localized name ordering) */
+  displayName: text('display_name'),
   email: text('email').notNull(),
   phone: text('phone'),
+  /** Gender — stored as enum for structured filtering */
+  gender: genderEnum('gender'),
+  /** Date of birth — stored as text in ISO 8601 format (YYYY-MM-DD) to avoid timezone issues */
+  dateOfBirth: text('date_of_birth'),
   createdAt: timestamp('created_at').notNull().defaultNow(),
   updatedAt: timestamp('updated_at').notNull().defaultNow(),
 }, (t) => ([
   index('candidate_organization_id_idx').on(t.organizationId),
+  index('candidate_gender_idx').on(t.organizationId, t.gender),
   uniqueIndex('candidate_org_email_idx').on(t.organizationId, t.email),
 ]))
 
@@ -166,6 +177,28 @@ export const questionResponse = pgTable('question_response', {
   index('question_response_question_id_idx').on(t.questionId),
 ]))
 
+// ─────────────────────────────────────────────
+// Organization Localization Settings
+// ─────────────────────────────────────────────
+
+/**
+ * Per-organization localization preferences.
+ * Controls how candidate names and dates are displayed across the app.
+ * One row per organization — upserted on change.
+ */
+export const orgSettings = pgTable('org_settings', {
+  id: text('id').primaryKey().$defaultFn(() => crypto.randomUUID()),
+  organizationId: text('organization_id').notNull().references(() => organization.id, { onDelete: 'cascade' }),
+  /** Controls whether names display as "First Last" or "Last First" */
+  nameDisplayFormat: nameDisplayFormatEnum('name_display_format').notNull().default('first_last'),
+  /** Controls the date display format across the app */
+  dateFormat: dateFormatEnum('date_format').notNull().default('mdy'),
+  createdAt: timestamp('created_at').notNull().defaultNow(),
+  updatedAt: timestamp('updated_at').notNull().defaultNow(),
+}, (t) => ([
+  uniqueIndex('org_settings_organization_id_idx').on(t.organizationId),
+]))
+
 // ─────────────────────────────────────────────
 // Invite Links & Join Requests
 // ─────────────────────────────────────────────
@@ -703,3 +736,7 @@ export const applicationSourceRelations = relations(applicationSource, ({ one })
   application: one(application, { fields: [applicationSource.applicationId], references: [application.id] }),
   trackingLink: one(trackingLink, { fields: [applicationSource.trackingLinkId], references: [trackingLink.id] }),
 }))
+
+export const orgSettingsRelations = relations(orgSettings, ({ one }) => ({
+  organization: one(organization, { fields: [orgSettings.organizationId], references: [organization.id] }),
+}))
diff --git a/server/utils/email.ts b/server/utils/email.ts
index 9ad8749..7d4bd7e 100644
--- a/server/utils/email.ts
+++ b/server/utils/email.ts
@@ -1,71 +1,158 @@
 import { Resend } from 'resend'
+import nodemailer from 'nodemailer'
+import type { Transporter } from 'nodemailer'
+
+// ─── Resend client ────────────────────────────────────────────────────────────
 
 let _resend: Resend | undefined
 
-/**
- * Returns a lazily-initialized Resend client.
- * Returns `null` when RESEND_API_KEY is not configured (dev/testing fallback).
- */
 function getResendClient(): Resend | null {
   const apiKey = env.RESEND_API_KEY
   if (!apiKey) return null
+  if (!_resend) _resend = new Resend(apiKey)
+  return _resend
+}
+
+// ─── SMTP transporter ─────────────────────────────────────────────────────────
+
+let _smtp: Transporter | undefined
 
-  if (!_resend) {
-    _resend = new Resend(apiKey)
+function getSmtpTransporter(): Transporter | null {
+  if (!env.SMTP_HOST) return null
+  if (!_smtp) {
+    _smtp = nodemailer.createTransport({
+      host: env.SMTP_HOST,
+      port: env.SMTP_PORT,
+      secure: env.SMTP_SECURE,
+      ...(env.SMTP_USER && env.SMTP_PASS
+        ? { auth: { user: env.SMTP_USER, pass: env.SMTP_PASS } }
+        : {}),
+    })
   }
-  return _resend
+  return _smtp
 }
 
 /**
- * Send an email verification link via Resend.
- * Falls back to console.info when RESEND_API_KEY is not set.
- *
- * Called by Better Auth when requireEmailVerification is enabled.
- * Not awaited by the caller (fire-and-forget) to prevent timing attacks.
+ * Returns the configured sender address for the active email provider.
+ * SMTP uses SMTP_FROM; Resend uses RESEND_FROM_EMAIL.
+ * Exported for use in routes that need the organizer address (e.g. ICS generation).
  */
-export async function sendVerificationEmail(data: {
-  user: { email: string; name: string }
-  url: string
-  token: string
-}): Promise<void> {
-  const resend = getResendClient()
+export function getFromEmail(): string {
+  return env.SMTP_HOST ? env.SMTP_FROM : env.RESEND_FROM_EMAIL
+}
+
+// ─── Internal unified send helper ────────────────────────────────────────────
 
-  if (!resend) {
-    console.warn('[Reqcore] Verification email suppressed — RESEND_API_KEY is not configured')
+interface EmailMessage {
+  to: string
+  subject: string
+  html: string
+  text: string
+  /** Optional .ics binary attachment (calendar invite). */
+  icsAttachment?: Buffer
+  /** Resend-only metadata tags — silently ignored by SMTP. */
+  resendTags?: Array<{ name: string; value: string }>
+  /** Message logged to console when no provider is configured (dev fallback). */
+  logFallback: string
+  /** logError category used on transport failure. */
+  errorCategory: string
+}
+
+/**
+ * Route an outbound email through SMTP (preferred) → Resend → console fallback.
+ * Priority: SMTP_HOST set → use SMTP. Else RESEND_API_KEY set → use Resend.
+ * Otherwise logs the fallback message and returns (no error thrown).
+ * Throws on transport errors so callers can decide whether to swallow them.
+ */
+async function sendEmail(msg: EmailMessage): Promise<void> {
+  const from = getFromEmail()
+
+  // 1. SMTP — takes priority when SMTP_HOST is configured
+  const smtp = getSmtpTransporter()
+  if (smtp) {
+    try {
+      await smtp.sendMail({
+        from,
+        to: msg.to,
+        subject: msg.subject,
+        html: msg.html,
+        text: msg.text,
+        ...(msg.icsAttachment
+          ? { attachments: [{ filename: 'interview.ics', content: msg.icsAttachment, contentType: 'text/calendar; method=REQUEST' }] }
+          : {}),
+      })
+    }
+    catch (err) {
+      logError(msg.errorCategory, {
+        provider: 'smtp',
+        error_message: err instanceof Error ? err.message : String(err),
+      })
+      throw err
+    }
     return
   }
 
-  const fromEmail = env.RESEND_FROM_EMAIL
+  // 2. Resend
+  const resend = getResendClient()
+  if (resend) {
+    const resendAttachments = msg.icsAttachment
+      ? [{ filename: 'interview.ics', content: msg.icsAttachment.toString('base64'), content_type: 'text/calendar; method=REQUEST' }]
+      : undefined
 
-  try {
     const { error } = await resend.emails.send({
-      from: fromEmail,
-      to: [data.user.email],
-      subject: 'Verify your email address — Reqcore',
-      html: buildVerificationHtml({ url: data.url }),
-      text: buildVerificationText({ url: data.url }),
-      tags: [{ name: 'category', value: 'verification' }],
+      from,
+      to: [msg.to],
+      subject: msg.subject,
+      html: msg.html,
+      text: msg.text,
+      ...(resendAttachments ? { attachments: resendAttachments } : {}),
+      ...(msg.resendTags ? { tags: msg.resendTags } : {}),
     })
 
     if (error) {
-      logError('email.verification_send_failed', {
+      logError(msg.errorCategory, {
         provider: 'resend',
         error_message: error.message,
       })
+      throw new Error(error.message)
     }
+    return
   }
-  catch (err) {
-    logError('email.verification_send_failed', {
-      provider: 'resend',
-      error_message: err instanceof Error ? err.message : String(err),
+
+  // 3. No provider configured — dev/test fallback
+  console.info(`[Reqcore] ${msg.logFallback}`)
+}
+
+// ─── Public send functions ────────────────────────────────────────────────────
+
+/**
+ * Send an email verification link.
+ * Called by Better Auth when requireEmailVerification is enabled.
+ * Not awaited by the caller (fire-and-forget) to prevent timing attacks.
+ */
+export async function sendVerificationEmail(data: {
+  user: { email: string; name: string }
+  url: string
+  token: string
+}): Promise<void> {
+  try {
+    await sendEmail({
+      to: data.user.email,
+      subject: 'Verify your email address — Reqcore',
+      html: buildVerificationHtml({ url: data.url }),
+      text: buildVerificationText({ url: data.url }),
+      resendTags: [{ name: 'category', value: 'verification' }],
+      logFallback: 'Verification email suppressed — no email provider configured (set SMTP_HOST or RESEND_API_KEY)',
+      errorCategory: 'email.verification_send_failed',
     })
   }
+  catch {
+    // fire-and-forget — error already logged inside sendEmail
+  }
 }
 
 /**
- * Send a password reset link via Resend.
- * Falls back to console.info when RESEND_API_KEY is not set.
- *
+ * Send a password reset link.
  * Called by Better Auth when sendResetPassword is configured.
  * Not awaited by the caller (fire-and-forget) to prevent timing attacks.
  */
@@ -74,43 +161,25 @@ export async function sendPasswordResetEmail(data: {
   url: string
   token: string
 }): Promise<void> {
-  const resend = getResendClient()
-
-  if (!resend) {
-    console.warn('[Reqcore] Password reset email suppressed — RESEND_API_KEY is not configured')
-    return
-  }
-
-  const fromEmail = env.RESEND_FROM_EMAIL
-
   try {
-    const { error } = await resend.emails.send({
-      from: fromEmail,
-      to: [data.user.email],
+    await sendEmail({
+      to: data.user.email,
       subject: 'Reset your password — Reqcore',
       html: buildPasswordResetHtml({ url: data.url }),
       text: buildPasswordResetText({ url: data.url }),
-      tags: [{ name: 'category', value: 'password-reset' }],
+      resendTags: [{ name: 'category', value: 'password-reset' }],
+      logFallback: 'Password reset email suppressed — no email provider configured (set SMTP_HOST or RESEND_API_KEY)',
+      errorCategory: 'email.password_reset_send_failed',
     })
-
-    if (error) {
-      logError('email.password_reset_send_failed', {
-        provider: 'resend',
-        error_message: error.message,
-      })
-    }
   }
-  catch (err) {
-    logError('email.password_reset_send_failed', {
-      provider: 'resend',
-      error_message: err instanceof Error ? err.message : String(err),
-    })
+  catch {
+    // fire-and-forget — error already logged inside sendEmail
   }
 }
 
 /**
- * Send an organization invitation email via Resend.
- * Falls back to console.info when RESEND_API_KEY is not set.
+ * Send an organization invitation email.
+ * Falls back to console.info when no email provider is configured.
  */
 export async function sendOrgInvitationEmail(data: {
   id: string
@@ -119,25 +188,8 @@ export async function sendOrgInvitationEmail(data: {
   organization: { name: string }
   role: string
 }, inviteLink: string): Promise<void> {
-  const resend = getResendClient()
-
-  if (!resend) {
-    // Dev/test fallback — log invitation link to console
-    console.info(
-      `[Reqcore] Invitation email → ${data.email} | ` +
-      `Invited by ${data.inviter.user.name} (${data.inviter.user.email}) | ` +
-      `Org: ${data.organization.name} | ` +
-      `Role: ${data.role} | ` +
-      `Link: ${inviteLink}`,
-    )
-    return
-  }
-
-  const fromEmail = env.RESEND_FROM_EMAIL
-
-  const { error } = await resend.emails.send({
-    from: fromEmail,
-    to: [data.email],
+  await sendEmail({
+    to: data.email,
     subject: `You're invited to join ${data.organization.name} on Reqcore`,
     html: buildInvitationHtml({
       inviteeName: data.email,
@@ -153,21 +205,18 @@ export async function sendOrgInvitationEmail(data: {
       role: data.role,
       inviteLink,
     }),
-    tags: [
+    resendTags: [
       { name: 'category', value: 'invitation' },
       { name: 'organization', value: data.organization.name.slice(0, 256).replace(/[^a-zA-Z0-9_-]/g, '_') },
     ],
+    logFallback:
+      `Invitation email → ${data.email} | ` +
+      `Invited by ${data.inviter.user.name} (${data.inviter.user.email}) | ` +
+      `Org: ${data.organization.name} | ` +
+      `Role: ${data.role} | ` +
+      `Link: ${inviteLink}`,
+    errorCategory: 'email.invitation_send_failed',
   })
-
-  if (error) {
-    logError('email.invitation_send_failed', {
-      provider: 'resend',
-      error_message: error.message,
-    })
-    throw new Error(`Failed to send invitation email: ${error.message}`)
-  }
-
-  console.info(`[Reqcore] Invitation email sent to ${data.email} via Resend`)
 }
 
 // ─────────────────────────────────────────────
@@ -467,9 +516,9 @@ export function renderTemplate(template: string, data: InterviewEmailData): stri
 }
 
 /**
- * Send an interview invitation email to a candidate via Resend.
+ * Send an interview invitation email to a candidate.
  * Includes an .ics calendar attachment and response links when provided.
- * Falls back to console.info when RESEND_API_KEY is not set.
+ * Falls back to console.info when no email provider is configured.
  */
 export async function sendInterviewInvitationEmail(params: {
   subject: string
@@ -479,53 +528,27 @@ export async function sendInterviewInvitationEmail(params: {
   const renderedSubject = renderTemplate(params.subject, params.data)
   const renderedBody = renderTemplate(params.body, params.data)
 
-  const resend = getResendClient()
-
-  if (!resend) {
-    console.info(
-      `[Reqcore] Interview invitation email → ${params.data.candidateEmail} | ` +
-      `Subject: ${renderedSubject} | ` +
-      `Interview: ${params.data.interviewTitle} | ` +
-      `Date: ${params.data.interviewDate} at ${params.data.interviewTime}` +
-      (params.data.icsContent ? ' | .ics attached' : '') +
-      (params.data.responseUrls ? ' | response links included' : ''),
-    )
-    return
-  }
-
-  const fromEmail = env.RESEND_FROM_EMAIL
-
-  // Build attachments array — include .ics when available
-  const attachments = params.data.icsContent
-    ? [{
-        filename: 'interview.ics',
-        content: Buffer.from(params.data.icsContent).toString('base64'),
-        content_type: 'text/calendar; method=REQUEST',
-      }]
-    : undefined
+  const icsBuffer = params.data.icsContent ? Buffer.from(params.data.icsContent) : undefined
 
-  const { error } = await resend.emails.send({
-    from: fromEmail,
-    to: [params.data.candidateEmail],
+  await sendEmail({
+    to: params.data.candidateEmail,
     subject: renderedSubject,
     html: buildInterviewInvitationHtml(renderedSubject, renderedBody, params.data),
     text: buildInterviewInvitationText(renderedBody, params.data.responseUrls),
-    ...(attachments ? { attachments } : {}),
-    tags: [
+    icsAttachment: icsBuffer,
+    resendTags: [
       { name: 'category', value: 'interview-invitation' },
       { name: 'interview', value: params.data.interviewTitle.slice(0, 256).replace(/[^a-zA-Z0-9_-]/g, '_') },
     ],
+    logFallback:
+      `Interview invitation email → ${params.data.candidateEmail} | ` +
+      `Subject: ${renderedSubject} | ` +
+      `Interview: ${params.data.interviewTitle} | ` +
+      `Date: ${params.data.interviewDate} at ${params.data.interviewTime}` +
+      (params.data.icsContent ? ' | .ics attached' : '') +
+      (params.data.responseUrls ? ' | response links included' : ''),
+    errorCategory: 'email.interview_invitation_send_failed',
   })
-
-  if (error) {
-    logError('email.interview_invitation_send_failed', {
-      provider: 'resend',
-      error_message: error.message,
-    })
-    throw new Error(`Failed to send interview invitation email: ${error.message}`)
-  }
-
-  console.info(`[Reqcore] Interview invitation email sent to ${params.data.candidateEmail} via Resend`)
 }
 
 function buildInterviewInvitationHtml(subject: string, bodyText: string, data: InterviewEmailData): string {
diff --git a/server/utils/env.ts b/server/utils/env.ts
index 0a26555..1ad4d11 100644
--- a/server/utils/env.ts
+++ b/server/utils/env.ts
@@ -104,6 +104,32 @@ export const envSchema = z
       .pipe(z.string().min(1))
       .optional()
       .default("Reqcore <noreply@reqcore.com>"),
+    /** SMTP hostname for outbound email (e.g. smtp.gmail.com). When set, SMTP is used instead of Resend. */
+    SMTP_HOST: emptyToUndefined.pipe(z.string().min(1)).optional(),
+    /** SMTP port. Defaults to 587 (STARTTLS). Use 465 for implicit TLS, 25 for unencrypted. */
+    SMTP_PORT: z.preprocess(
+      (val) => {
+        if (typeof val === 'string' && val.trim() === '') return 587
+        if (val === undefined) return 587
+        const n = Number(val)
+        return Number.isNaN(n) ? val : n
+      },
+      z.number().int().min(1).max(65535).default(587),
+    ),
+    /** SMTP username for authentication. Omit for anonymous relay. */
+    SMTP_USER: emptyToUndefined.pipe(z.string().min(1)).optional(),
+    /** SMTP password for authentication. Omit for anonymous relay. */
+    SMTP_PASS: emptyToUndefined.pipe(z.string().min(1)).optional(),
+    /** Sender address for SMTP emails. Defaults to "Reqcore <noreply@reqcore.com>". */
+    SMTP_FROM: emptyToUndefined
+      .pipe(z.string().min(1))
+      .optional()
+      .default('Reqcore <noreply@reqcore.com>'),
+    /** Use implicit TLS on port 465. When false, uses STARTTLS (port 587). Defaults to false. */
+    SMTP_SECURE: z.preprocess(
+      (val) => typeof val === 'string' && val.trim() === '' ? false : val === 'true',
+      z.boolean().default(false),
+    ),
     /** Google OAuth2 Client ID for Calendar integration. Obtain from Google Cloud Console. */
     GOOGLE_CLIENT_ID: emptyToUndefined.pipe(z.string().min(1)).optional(),
     /** Google OAuth2 Client Secret for Calendar integration. */
@@ -153,6 +179,15 @@ export const envSchema = z
       });
     }
 
+    // SMTP: credentials without a host is a misconfiguration.
+    if (!data.SMTP_HOST && (data.SMTP_USER || data.SMTP_PASS)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['SMTP_HOST'],
+        message: 'SMTP_HOST is required when SMTP_USER or SMTP_PASS is set.',
+      })
+    }
+
     // OIDC SSO requires all three vars or none — partial config is a misconfiguration.
     const oidcVars = [
       ["OIDC_CLIENT_ID", data.OIDC_CLIENT_ID],
@@ -202,7 +237,7 @@ export const env = new Proxy({} as z.infer<typeof envSchema>, {
             `Ensure these variables are set in your Railway service (Settings → Variables).\n` +
             `Required: DATABASE_URL, BETTER_AUTH_SECRET, S3_ENDPOINT, S3_ACCESS_KEY, S3_SECRET_KEY, S3_BUCKET\n` +
             `Required when not on Railway: BETTER_AUTH_URL (or generate a Railway domain)\n` +
-            `Optional: BETTER_AUTH_TRUSTED_ORIGINS, S3_REGION (default: us-east-1), S3_FORCE_PATH_STYLE (default: true), TRUSTED_PROXY_IP, DEMO_ORG_SLUG, RESEND_API_KEY, RESEND_FROM_EMAIL, OIDC_CLIENT_ID, OIDC_CLIENT_SECRET, OIDC_DISCOVERY_URL, OIDC_PROVIDER_NAME, AUTH_GOOGLE_CLIENT_ID, AUTH_GOOGLE_CLIENT_SECRET, AUTH_GITHUB_CLIENT_ID, AUTH_GITHUB_CLIENT_SECRET, AUTH_MICROSOFT_CLIENT_ID, AUTH_MICROSOFT_CLIENT_SECRET, AUTH_MICROSOFT_TENANT_ID\n`,
+            `Optional: BETTER_AUTH_TRUSTED_ORIGINS, S3_REGION (default: us-east-1), S3_FORCE_PATH_STYLE (default: true), TRUSTED_PROXY_IP, DEMO_ORG_SLUG, RESEND_API_KEY, RESEND_FROM_EMAIL, SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASS, SMTP_FROM, SMTP_SECURE, OIDC_CLIENT_ID, OIDC_CLIENT_SECRET, OIDC_DISCOVERY_URL, OIDC_PROVIDER_NAME, AUTH_GOOGLE_CLIENT_ID, AUTH_GOOGLE_CLIENT_SECRET, AUTH_GITHUB_CLIENT_ID, AUTH_GITHUB_CLIENT_SECRET, AUTH_MICROSOFT_CLIENT_ID, AUTH_MICROSOFT_CLIENT_SECRET, AUTH_MICROSOFT_TENANT_ID\n`,
         );
         throw result.error;
       }
diff --git a/server/utils/schemas/candidate.ts b/server/utils/schemas/candidate.ts
index 4bde5c1..54d0961 100644
--- a/server/utils/schemas/candidate.ts
+++ b/server/utils/schemas/candidate.ts
@@ -4,10 +4,25 @@ import { z } from 'zod'
 // Candidate validation schemas — shared across API routes
 // ─────────────────────────────────────────────
 
+const genderValues = ['male', 'female', 'other', 'prefer_not_to_say'] as const
+
+/** ISO 8601 date string (YYYY-MM-DD), validated to be a real date in a reasonable range */
+const dobSchema = z
+  .string()
+  .regex(/^\d{4}-\d{2}-\d{2}$/, 'Date of birth must be in YYYY-MM-DD format')
+  .refine((val) => {
+    const d = new Date(val)
+    if (isNaN(d.getTime())) return false
+    const year = d.getFullYear()
+    const now = new Date()
+    return year >= 1900 && d <= now
+  }, 'Date of birth must be a valid past date')
+
 /** Schema for creating a new candidate */
 export const createCandidateSchema = z.object({
   firstName: z.string().min(1, 'First name is required').max(100),
   lastName: z.string().min(1, 'Last name is required').max(100),
+  displayName: z.string().max(200).optional(),
   email: z
     .string()
     .min(1, 'Email is required')
@@ -15,12 +30,15 @@ export const createCandidateSchema = z.object({
     .max(255)
     .transform((v) => v.toLowerCase().trim()),
   phone: z.string().max(50).optional(),
+  gender: z.enum(genderValues).optional(),
+  dateOfBirth: dobSchema.optional(),
 })
 
 /** Schema for updating an existing candidate (all fields optional) */
 export const updateCandidateSchema = z.object({
   firstName: z.string().min(1, 'First name is required').max(100).optional(),
   lastName: z.string().min(1, 'Last name is required').max(100).optional(),
+  displayName: z.string().max(200).nullish(),
   email: z
     .string()
     .email('Invalid email address')
@@ -28,6 +46,8 @@ export const updateCandidateSchema = z.object({
     .transform((v) => v.toLowerCase().trim())
     .optional(),
   phone: z.string().max(50).nullish(),
+  gender: z.enum(genderValues).nullish(),
+  dateOfBirth: dobSchema.nullish(),
 })
 
 /** Schema for candidate list query params */
@@ -35,6 +55,7 @@ export const candidateQuerySchema = z.object({
   page: z.coerce.number().int().min(1).default(1),
   limit: z.coerce.number().int().min(1).max(100).default(20),
   search: z.string().trim().max(200).optional(),
+  gender: z.enum(genderValues).optional(),
 })
 
 /** Reusable schema for `:id` route params */
diff --git a/server/utils/schemas/job.ts b/server/utils/schemas/job.ts
index aac7d75..25d8c08 100644
--- a/server/utils/schemas/job.ts
+++ b/server/utils/schemas/job.ts
@@ -15,14 +15,16 @@ export const createJobSchema = z.object({
   /** Optional custom slug — if omitted, generated from title */
   slug: z.string().max(80).optional(),
   /** Salary range fields for SEO-rich job postings (Google Jobs) */
-  salaryMin: z.coerce.number().int().min(0).optional(),
-  salaryMax: z.coerce.number().int().min(0).optional(),
-  salaryCurrency: z.string().length(3).optional(),
-  salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).optional(),
+  salaryMin: z.coerce.number().int().min(0).nullable().optional(),
+  salaryMax: z.coerce.number().int().min(0).nullable().optional(),
+  salaryCurrency: z.string().length(3).nullable().optional(),
+  salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).nullable().optional(),
+  /** Whether salary is negotiable (hides min/max range on public listing) */
+  salaryNegotiable: z.boolean().optional().default(false),
   /** Remote work status: remote, hybrid, or onsite */
-  remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).optional(),
+  remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).nullable().optional(),
   /** When this job listing expires (required for Google Jobs rich results) */
-  validThrough: z.coerce.date().optional(),
+  validThrough: z.coerce.date().nullable().optional(),
   /** Whether the application form requires a resume/CV upload */
   requireResume: z.boolean().optional().default(false),
   /** Whether the application form asks for a cover letter upload */
@@ -34,16 +36,19 @@ export const createJobSchema = z.object({
 /** Schema for updating an existing job (all fields optional, no defaults — PATCH semantics) */
 export const updateJobSchema = z.object({
   title: z.string().min(1, 'Title is required').max(200).optional(),
-  description: z.string().optional(),
-  location: z.string().optional(),
+  description: z.string().nullable().optional(),
+  location: z.string().nullable().optional(),
   type: z.enum(['full_time', 'part_time', 'contract', 'internship']).optional(),
   slug: z.string().max(80).optional(),
-  salaryMin: z.coerce.number().int().min(0).optional(),
-  salaryMax: z.coerce.number().int().min(0).optional(),
-  salaryCurrency: z.string().length(3).optional(),
-  salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).optional(),
-  remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).optional(),
-  validThrough: z.coerce.date().optional(),
+  /** Pass null to explicitly clear a salary field */
+  salaryMin: z.coerce.number().int().min(0).nullable().optional(),
+  salaryMax: z.coerce.number().int().min(0).nullable().optional(),
+  salaryCurrency: z.string().length(3).nullable().optional(),
+  salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).nullable().optional(),
+  salaryNegotiable: z.boolean().optional(),
+  remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).nullable().optional(),
+  /** Pass null to explicitly clear the expiry date */
+  validThrough: z.coerce.date().nullable().optional(),
   requireResume: z.boolean().optional(),
   requireCoverLetter: z.boolean().optional(),
   autoScoreOnApply: z.boolean().optional(),
diff --git a/server/utils/schemas/orgSettings.ts b/server/utils/schemas/orgSettings.ts
new file mode 100644
index 0000000..d1a689a
--- /dev/null
+++ b/server/utils/schemas/orgSettings.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod'
+
+// ─────────────────────────────────────────────
+// Org settings validation schemas
+// ─────────────────────────────────────────────
+
+export const updateOrgSettingsSchema = z.object({
+  nameDisplayFormat: z.enum(['first_last', 'last_first']).optional(),
+  dateFormat: z.enum(['mdy', 'dmy', 'ymd']).optional(),
+})

From a976d8d45292e051d9a51a48fd348024ef56c9ca Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 11:44:52 +0200
Subject: [PATCH 2/7] fix: remove orphaned code after </template> in
 candidates/new.vue

---
 app/pages/dashboard/candidates/new.vue | 158 -------------------------
 1 file changed, 158 deletions(-)

diff --git a/app/pages/dashboard/candidates/new.vue b/app/pages/dashboard/candidates/new.vue
index 96a043c..d214fba 100644
--- a/app/pages/dashboard/candidates/new.vue
+++ b/app/pages/dashboard/candidates/new.vue
@@ -254,161 +254,3 @@ async function handleSubmit() {
     </form>
   </div>
 </template>
-
-
-const isSubmitting = ref(false)
-const errors = ref<Record<string, string>>({})
-const submitError = ref<string | null>(null)
-
-const formSchema = z.object({
-  firstName: z.string().min(1, 'First name is required').max(100),
-  lastName: z.string().min(1, 'Last name is required').max(100),
-  email: z.string().min(1, 'Email is required').email('Invalid email address').max(255),
-  phone: z.string().max(50).optional(),
-})
-
-function validate(): boolean {
-  const result = formSchema.safeParse(form.value)
-  if (!result.success) {
-    errors.value = {}
-    for (const issue of result.error.issues) {
-      const field = issue.path[0]?.toString()
-      if (field) errors.value[field] = issue.message
-    }
-    return false
-  }
-  errors.value = {}
-  return true
-}
-
-async function handleSubmit() {
-  submitError.value = null
-  if (!validate()) return
-
-  isSubmitting.value = true
-  try {
-    await createCandidate({
-      firstName: form.value.firstName,
-      lastName: form.value.lastName,
-      email: form.value.email,
-      phone: form.value.phone || undefined,
-    })
-    track('candidate_added')
-    await navigateTo(localePath('/dashboard/candidates'))
-  } catch (err: any) {
-    const message = err.data?.statusMessage ?? 'Something went wrong'
-    // Show email conflict as a field-level error
-    if (err.statusCode === 409 || err.data?.statusCode === 409) {
-      errors.value.email = message
-    } else {
-      submitError.value = message
-    }
-  } finally {
-    isSubmitting.value = false
-  }
-}
-</script>
-
-<template>
-  <div class="mx-auto max-w-2xl">
-    <!-- Back link -->
-    <NuxtLink
-      :to="$localePath('/dashboard/candidates')"
-      class="inline-flex items-center gap-1 text-sm text-surface-500 dark:text-surface-400 hover:text-surface-700 dark:hover:text-surface-200 mb-6 transition-colors"
-    >
-      <ArrowLeft class="size-4" />
-      Back to Candidates
-    </NuxtLink>
-
-    <h1 class="text-2xl font-bold text-surface-900 dark:text-surface-100 mb-6">Add Candidate</h1>
-
-    <!-- Server error -->
-    <div
-      v-if="submitError"
-      class="rounded-lg border border-danger-200 dark:border-danger-800 bg-danger-50 dark:bg-danger-950 p-3 text-sm text-danger-700 dark:text-danger-400 mb-4"
-    >
-      {{ submitError }}
-    </div>
-
-    <form class="space-y-5" @submit.prevent="handleSubmit">
-      <!-- First Name -->
-      <div>
-        <label for="firstName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-          First Name <span class="text-danger-500">*</span>
-        </label>
-        <input
-          id="firstName"
-          v-model="form.firstName"
-          type="text"
-          placeholder="e.g. Jane"
-          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-          :class="errors.firstName ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
-        />
-        <p v-if="errors.firstName" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.firstName }}</p>
-      </div>
-
-      <!-- Last Name -->
-      <div>
-        <label for="lastName" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-          Last Name <span class="text-danger-500">*</span>
-        </label>
-        <input
-          id="lastName"
-          v-model="form.lastName"
-          type="text"
-          placeholder="e.g. Doe"
-          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-          :class="errors.lastName ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
-        />
-        <p v-if="errors.lastName" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.lastName }}</p>
-      </div>
-
-      <!-- Email -->
-      <div>
-        <label for="email" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-          Email <span class="text-danger-500">*</span>
-        </label>
-        <input
-          id="email"
-          v-model="form.email"
-          type="email"
-          placeholder="e.g. jane.doe@example.com"
-          class="w-full rounded-lg border px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-          :class="errors.email ? 'border-danger-300' : 'border-surface-300 dark:border-surface-700'"
-        />
-        <p v-if="errors.email" class="mt-1 text-xs text-danger-600 dark:text-danger-400">{{ errors.email }}</p>
-      </div>
-
-      <!-- Phone -->
-      <div>
-        <label for="phone" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
-          Phone
-        </label>
-        <input
-          id="phone"
-          v-model="form.phone"
-          type="tel"
-          placeholder="e.g. +1 (555) 123-4567"
-          class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-900 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-        />
-      </div>
-
-      <!-- Actions -->
-      <div class="flex items-center gap-3 pt-2">
-        <button
-          type="submit"
-          :disabled="isSubmitting"
-          class="inline-flex items-center rounded-lg bg-brand-600 px-4 py-2 text-sm font-medium text-white hover:bg-brand-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
-        >
-          {{ isSubmitting ? 'Adding…' : 'Add Candidate' }}
-        </button>
-        <NuxtLink
-          :to="$localePath('/dashboard/candidates')"
-          class="rounded-lg border border-surface-300 dark:border-surface-700 px-4 py-2 text-sm font-medium text-surface-700 dark:text-surface-300 hover:bg-surface-50 dark:hover:bg-surface-800 transition-colors"
-        >
-          Cancel
-        </NuxtLink>
-      </div>
-    </form>
-  </div>
-</template>

From 6c238c2fae2341639bde2f961ba1bbd36708044f Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 11:47:55 +0200
Subject: [PATCH 3/7] feat: add salary input change handlers and update
 permissions for organization

---
 app/pages/dashboard/jobs/[id]/settings.vue | 14 ++++++-
 app/pages/dashboard/settings/ai.vue        | 14 ++++++-
 package-lock.json                          | 49 ++++++++++++++--------
 shared/permissions.ts                      |  4 ++
 4 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/app/pages/dashboard/jobs/[id]/settings.vue b/app/pages/dashboard/jobs/[id]/settings.vue
index b7c9f39..f24d3af 100644
--- a/app/pages/dashboard/jobs/[id]/settings.vue
+++ b/app/pages/dashboard/jobs/[id]/settings.vue
@@ -216,6 +216,16 @@ const salaryUnitOptions = [
   { value: 'MONTH', label: 'Per month' },
   { value: 'HOUR', label: 'Per hour' },
 ]
+
+function onSalaryMinChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  if (!input.value) form.value.salaryMin = null
+}
+
+function onSalaryMaxChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  if (!input.value) form.value.salaryMax = null
+}
 </script>
 
 <template>
@@ -382,7 +392,7 @@ const salaryUnitOptions = [
                     min="0"
                     placeholder="e.g. 50000"
                     class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-                    @change="if (!($event.target as HTMLInputElement).value) form.salaryMin = null"
+                    @change="onSalaryMinChange"
                   />
                 </div>
                 <div>
@@ -396,7 +406,7 @@ const salaryUnitOptions = [
                     min="0"
                     placeholder="e.g. 80000"
                     class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-                    @change="if (!($event.target as HTMLInputElement).value) form.salaryMax = null"
+                    @change="onSalaryMaxChange"
                   />
                 </div>
               </div>
diff --git a/app/pages/dashboard/settings/ai.vue b/app/pages/dashboard/settings/ai.vue
index e9f41bb..b9d536f 100644
--- a/app/pages/dashboard/settings/ai.vue
+++ b/app/pages/dashboard/settings/ai.vue
@@ -153,6 +153,16 @@ async function testConnection() {
     isTesting.value = false
   }
 }
+
+function onInputPriceChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  form.value.inputPricePer1m = input.value ? Number(input.value) : null
+}
+
+function onOutputPriceChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  form.value.outputPricePer1m = input.value ? Number(input.value) : null
+}
 </script>
 
 <template>
@@ -357,7 +367,7 @@ async function testConnection() {
                   step="0.01"
                   placeholder="0.00"
                   class="w-full rounded-lg border border-surface-200 dark:border-surface-700 bg-white dark:bg-surface-800 pl-7 pr-3 py-2 text-sm text-surface-900 dark:text-surface-100 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors tabular-nums"
-                  @input="form.inputPricePer1m = ($event.target as HTMLInputElement).value ? Number(($event.target as HTMLInputElement).value) : null"
+                  @input="onInputPriceChange"
                 />
               </div>
             </div>
@@ -375,7 +385,7 @@ async function testConnection() {
                   step="0.01"
                   placeholder="0.00"
                   class="w-full rounded-lg border border-surface-200 dark:border-surface-700 bg-white dark:bg-surface-800 pl-7 pr-3 py-2 text-sm text-surface-900 dark:text-surface-100 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors tabular-nums"
-                  @input="form.outputPricePer1m = ($event.target as HTMLInputElement).value ? Number(($event.target as HTMLInputElement).value) : null"
+                  @input="onOutputPriceChange"
                 />
               </div>
             </div>
diff --git a/package-lock.json b/package-lock.json
index d406ef5..5b499ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -995,13 +995,13 @@
       }
     },
     "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.18",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.18.tgz",
-      "integrity": "sha512-BMDNVG1ETXRhl1tnisQiYBef3RShJ1kfZA7x7afivTFMLirfHNTb6U71K569HNXhSXbQZsweHvSDZ6euBw8hPA==",
+      "version": "3.972.19",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.19.tgz",
+      "integrity": "sha512-Cw8IOMdBUEIl8ZlhRC3Dc/E64D5B5/8JhV6vhPLiPfJwcRC84S6F8aBOIi/N4vR9ZyA4I5Cc0Ateb/9EHaJXeQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.14.1",
-        "fast-xml-parser": "5.5.8",
+        "fast-xml-parser": "5.7.1",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2984,6 +2984,18 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@nodable/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7741,9 +7753,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
-      "integrity": "sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.13.tgz",
+      "integrity": "sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -10474,9 +10486,9 @@
       }
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
-      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
+      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
       "funding": [
         {
           "type": "github",
@@ -10489,9 +10501,9 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.5.11",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.11.tgz",
-      "integrity": "sha512-QL0eb0YbSTVWF6tTf1+LEMSgtCEjBYPpnAjoLC8SscESlAjXEIRJ7cHtLG0pLeDFaZLa4VKZLArtA/60ZS7vyA==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz",
+      "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==",
       "funding": [
         {
           "type": "github",
@@ -10500,8 +10512,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.1.4",
-        "path-expression-matcher": "^1.4.0",
+        "@nodable/entities": "^2.1.0",
+        "fast-xml-builder": "^1.1.5",
+        "path-expression-matcher": "^1.5.0",
         "strnum": "^2.2.3"
       },
       "bin": {
@@ -15420,9 +15433,9 @@
       }
     },
     "node_modules/path-expression-matcher": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.4.0.tgz",
-      "integrity": "sha512-s4DQMxIdhj3jLFWd9LxHOplj4p9yQ4ffMGowFf3cpEgrrJjEhN0V5nxw4Ye1EViAGDoL4/1AeO6qHpqYPOzE4Q==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
+      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
       "funding": [
         {
           "type": "github",
diff --git a/shared/permissions.ts b/shared/permissions.ts
index a4d9799..a11033f 100644
--- a/shared/permissions.ts
+++ b/shared/permissions.ts
@@ -28,6 +28,7 @@ import {
 // `as const` is mandatory for TypeScript inference.
 
 const atsStatements = {
+  organization: ['read', 'update', 'delete'],
   job: ['create', 'read', 'update', 'delete'],
   candidate: ['create', 'read', 'update', 'delete'],
   application: ['create', 'read', 'update', 'delete'],
@@ -57,6 +58,7 @@ export const ac = createAccessControl(statements)
 
 export const owner = ac.newRole({
   ...ownerAc.statements,
+  organization: ['read', 'update', 'delete'],
   job: ['create', 'read', 'update', 'delete'],
   candidate: ['create', 'read', 'update', 'delete'],
   application: ['create', 'read', 'update', 'delete'],
@@ -71,6 +73,7 @@ export const owner = ac.newRole({
 
 export const admin = ac.newRole({
   ...adminAc.statements,
+  organization: ['read', 'update', 'delete'],
   job: ['create', 'read', 'update', 'delete'],
   candidate: ['create', 'read', 'update', 'delete'],
   application: ['create', 'read', 'update', 'delete'],
@@ -85,6 +88,7 @@ export const admin = ac.newRole({
 
 export const member = ac.newRole({
   ...memberAc.statements,
+  organization: ['read'],
   job: ['read'],
   candidate: ['create', 'read', 'update'],
   application: ['create', 'read', 'update'],

From 36e3e8171fc367c89afe17c38522e0ea447e0911 Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 12:12:36 +0200
Subject: [PATCH 4/7] feat: add new migration entries for candidate
 demographics organization settings and salary negotiable

---
 server/database/migrations/meta/_journal.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/server/database/migrations/meta/_journal.json b/server/database/migrations/meta/_journal.json
index c88691e..46797ce 100644
--- a/server/database/migrations/meta/_journal.json
+++ b/server/database/migrations/meta/_journal.json
@@ -148,6 +148,20 @@
       "when": 1776076881696,
       "tag": "0020_goofy_grey_gargoyle",
       "breakpoints": true
+    },
+    {
+      "idx": 21,
+      "version": "7",
+      "when": 1776400000000,
+      "tag": "0021_candidate_demographics_org_settings",
+      "breakpoints": true
+    },
+    {
+      "idx": 22,
+      "version": "7",
+      "when": 1776450000000,
+      "tag": "0022_salary_negotiable",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file

From d36b5a07ae2aecb0ffc3faa52eabf5219f8da468 Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 12:57:22 +0200
Subject: [PATCH 5/7] feat: add experience level and quick notes fields to job
 and candidate schemas

---
 app/composables/useCandidates.ts              |   6 +
 app/composables/useJob.ts                     |   1 +
 app/composables/useJobs.ts                    |   1 +
 app/pages/dashboard/candidates/index.vue      | 180 ++++++++++++++++--
 app/pages/dashboard/jobs/[id]/settings.vue    |  28 +++
 app/pages/dashboard/jobs/new.vue              |   1 +
 server/api/candidates/[id].get.ts             |   1 +
 server/api/candidates/[id].patch.ts           |   1 +
 server/api/candidates/index.get.ts            |  11 +-
 server/api/candidates/index.post.ts           |   1 +
 server/api/jobs/[id].get.ts                   |   1 +
 server/api/jobs/[id].patch.ts                 |   1 +
 server/api/jobs/index.post.ts                 |   2 +
 .../migrations/0023_job_experience_level.sql  |   7 +
 .../migrations/0024_candidate_quick_notes.sql |   4 +
 server/database/schema/app.ts                 |   5 +
 server/utils/schemas/candidate.ts             |   4 +
 server/utils/schemas/job.ts                   |   5 +
 18 files changed, 248 insertions(+), 12 deletions(-)
 create mode 100644 server/database/migrations/0023_job_experience_level.sql
 create mode 100644 server/database/migrations/0024_candidate_quick_notes.sql

diff --git a/app/composables/useCandidates.ts b/app/composables/useCandidates.ts
index 5d57b0c..36fbfc0 100644
--- a/app/composables/useCandidates.ts
+++ b/app/composables/useCandidates.ts
@@ -7,11 +7,17 @@ import { usePreviewReadOnly } from '~/composables/usePreviewReadOnly'
  */
 export function useCandidates(options?: {
   search?: Ref<string | undefined> | string
+  gender?: Ref<string | undefined> | string
+  dobFrom?: Ref<string | undefined> | string
+  dobTo?: Ref<string | undefined> | string
 }) {
   const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 
   const query = computed(() => ({
     ...(toValue(options?.search) && { search: toValue(options?.search) }),
+    ...(toValue(options?.gender) && { gender: toValue(options?.gender) }),
+    ...(toValue(options?.dobFrom) && { dobFrom: toValue(options?.dobFrom) }),
+    ...(toValue(options?.dobTo) && { dobTo: toValue(options?.dobTo) }),
   }))
 
   const { data, status: fetchStatus, error, refresh } = useFetch('/api/candidates', {
diff --git a/app/composables/useJob.ts b/app/composables/useJob.ts
index f1ecc37..d445dc2 100644
--- a/app/composables/useJob.ts
+++ b/app/composables/useJob.ts
@@ -34,6 +34,7 @@ export function useJob(id: MaybeRefOrGetter<string>) {
     requireResume: boolean
     requireCoverLetter: boolean
     autoScoreOnApply: boolean
+    experienceLevel: 'junior' | 'mid' | 'senior' | 'lead' | null
   }>) {
     try {
       const updated = await $fetch(`/api/jobs/${jobId.value}`, {
diff --git a/app/composables/useJobs.ts b/app/composables/useJobs.ts
index 06afba7..ca8ff3a 100644
--- a/app/composables/useJobs.ts
+++ b/app/composables/useJobs.ts
@@ -28,6 +28,7 @@ export function useJobs(options?: {
     description?: string
     location?: string
     type?: 'full_time' | 'part_time' | 'contract' | 'internship'
+    experienceLevel?: 'junior' | 'mid' | 'senior' | 'lead'
     remoteStatus?: 'remote' | 'hybrid' | 'onsite'
     requireResume?: boolean
     requireCoverLetter?: boolean
diff --git a/app/pages/dashboard/candidates/index.vue b/app/pages/dashboard/candidates/index.vue
index 6a969ca..fd912a7 100644
--- a/app/pages/dashboard/candidates/index.vue
+++ b/app/pages/dashboard/candidates/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Users, Plus, Search, Mail, Phone, ArrowUp, ArrowDown, ArrowUpDown } from 'lucide-vue-next'
+import { Users, Plus, Search, Mail, Phone, ArrowUp, ArrowDown, ArrowUpDown, SlidersHorizontal, X, StickyNote } from 'lucide-vue-next'
 
 definePageMeta({
   layout: 'dashboard',
@@ -22,8 +22,28 @@ watch(searchInput, (val) => {
   }, 300)
 })
 
+// ── Filters ───────────────────────────────────────────────────────────────────
+
+const showFilters = ref(false)
+const filterGender = ref<string | undefined>(undefined)
+const filterDobFrom = ref<string | undefined>(undefined)
+const filterDobTo = ref<string | undefined>(undefined)
+
+const activeFilterCount = computed(() =>
+  [filterGender.value, filterDobFrom.value, filterDobTo.value].filter(Boolean).length
+)
+
+function clearFilters() {
+  filterGender.value = undefined
+  filterDobFrom.value = undefined
+  filterDobTo.value = undefined
+}
+
 const { candidates, total, fetchStatus, error, refresh } = useCandidates({
   search: debouncedSearch,
+  gender: filterGender,
+  dobFrom: filterDobFrom,
+  dobTo: filterDobTo,
 })
 
 // ── Sorting ───────────────────────────────────────────────────────────────────
@@ -66,10 +86,39 @@ const sortedCandidates = computed(() => {
 
   return list
 })
+
+// ── Quick notes inline editing ────────────────────────────────────────────────
+
+const editingNotesId = ref<string | null>(null)
+const editingNotesValue = ref('')
+const isSavingNotes = ref(false)
+
+function startEditNotes(candidateId: string, currentNotes: string | null) {
+  editingNotesId.value = candidateId
+  editingNotesValue.value = currentNotes ?? ''
+}
+
+async function saveNotes(candidateId: string) {
+  isSavingNotes.value = true
+  try {
+    await $fetch(`/api/candidates/${candidateId}`, {
+      method: 'PATCH',
+      body: { quickNotes: editingNotesValue.value || null },
+    })
+    await refresh()
+  } finally {
+    isSavingNotes.value = false
+    editingNotesId.value = null
+  }
+}
+
+function cancelEditNotes() {
+  editingNotesId.value = null
+}
 </script>
 
 <template>
-  <div class="mx-auto max-w-5xl">
+  <div class="mx-auto max-w-6xl">
     <!-- Header -->
     <div class="flex items-center justify-between mb-6">
       <div>
@@ -87,15 +136,81 @@ const sortedCandidates = computed(() => {
       </NuxtLink>
     </div>
 
-    <!-- Search -->
-    <div class="relative mb-6">
-      <Search class="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-surface-400" />
-      <input
-        v-model="searchInput"
-        type="text"
-        placeholder="Search by name or email…"
-        class="w-full rounded-lg border border-surface-200 dark:border-surface-800 bg-white dark:bg-surface-900 pl-10 pr-3 py-2 text-sm text-surface-900 dark:text-surface-100 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
-      />
+    <!-- Search + filter row -->
+    <div class="flex items-center gap-2 mb-4">
+      <div class="relative flex-1">
+        <Search class="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-surface-400" />
+        <input
+          v-model="searchInput"
+          type="text"
+          placeholder="Search by name or email…"
+          class="w-full rounded-lg border border-surface-200 dark:border-surface-800 bg-white dark:bg-surface-900 pl-10 pr-3 py-2 text-sm text-surface-900 dark:text-surface-100 placeholder:text-surface-400 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+        />
+      </div>
+      <button
+        type="button"
+        class="inline-flex items-center gap-1.5 rounded-lg border px-3 py-2 text-sm font-medium transition-colors"
+        :class="showFilters || activeFilterCount > 0
+          ? 'border-brand-300 bg-brand-50 text-brand-700 dark:border-brand-700 dark:bg-brand-950 dark:text-brand-300'
+          : 'border-surface-200 dark:border-surface-800 bg-white dark:bg-surface-900 text-surface-600 dark:text-surface-400 hover:bg-surface-50 dark:hover:bg-surface-800'"
+        @click="showFilters = !showFilters"
+      >
+        <SlidersHorizontal class="size-4" />
+        Filters
+        <span
+          v-if="activeFilterCount > 0"
+          class="inline-flex items-center justify-center size-4 rounded-full bg-brand-600 text-white text-xs font-semibold"
+        >{{ activeFilterCount }}</span>
+      </button>
+    </div>
+
+    <!-- Filter panel -->
+    <div
+      v-if="showFilters"
+      class="rounded-lg border border-surface-200 dark:border-surface-800 bg-surface-50 dark:bg-surface-800/50 p-4 mb-4 grid grid-cols-1 sm:grid-cols-3 gap-4"
+    >
+      <!-- Gender -->
+      <div>
+        <label class="block text-xs font-medium text-surface-600 dark:text-surface-400 mb-1">Gender</label>
+        <select
+          v-model="filterGender"
+          class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm bg-white dark:bg-surface-900 text-surface-900 dark:text-surface-100 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+        >
+          <option :value="undefined">Any</option>
+          <option value="male">Male</option>
+          <option value="female">Female</option>
+          <option value="other">Other</option>
+          <option value="prefer_not_to_say">Prefer not to say</option>
+        </select>
+      </div>
+      <!-- Date of birth — from -->
+      <div>
+        <label class="block text-xs font-medium text-surface-600 dark:text-surface-400 mb-1">Date of birth — from</label>
+        <input
+          v-model="filterDobFrom"
+          type="date"
+          class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm bg-white dark:bg-surface-900 text-surface-900 dark:text-surface-100 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+        />
+      </div>
+      <!-- Date of birth — to -->
+      <div>
+        <label class="block text-xs font-medium text-surface-600 dark:text-surface-400 mb-1">Date of birth — to</label>
+        <div class="flex items-center gap-2">
+          <input
+            v-model="filterDobTo"
+            type="date"
+            class="flex-1 rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm bg-white dark:bg-surface-900 text-surface-900 dark:text-surface-100 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+          />
+          <button
+            v-if="activeFilterCount > 0"
+            type="button"
+            class="text-xs text-surface-400 hover:text-danger-500 dark:hover:text-danger-400 transition-colors underline shrink-0"
+            @click="clearFilters"
+          >
+            Clear all
+          </button>
+        </div>
+      </div>
     </div>
 
     <!-- Loading state -->
@@ -183,6 +298,9 @@ const sortedCandidates = computed(() => {
                   <ArrowUpDown v-else class="size-3.5 opacity-40" />
                 </button>
               </th>
+              <th class="text-left px-4 py-3 font-medium text-surface-500 dark:text-surface-400 hidden lg:table-cell w-52">
+                Quick notes
+              </th>
             </tr>
           </thead>
           <tbody class="divide-y divide-surface-100 dark:divide-surface-800">
@@ -229,6 +347,46 @@ const sortedCandidates = computed(() => {
               <td class="px-4 py-3 text-surface-500 dark:text-surface-400 whitespace-nowrap">
                 <TimelineDateLink :date="c.createdAt">{{ new Date(c.createdAt).toLocaleDateString() }}</TimelineDateLink>
               </td>
+              <!-- Quick notes — inline editable -->
+              <td class="px-4 py-3 hidden lg:table-cell" @click.stop>
+                <div v-if="editingNotesId === c.id" class="flex items-start gap-1.5">
+                  <textarea
+                    v-model="editingNotesValue"
+                    rows="2"
+                    maxlength="1000"
+                    autofocus
+                    class="flex-1 rounded border border-surface-300 dark:border-surface-700 bg-white dark:bg-surface-800 px-2 py-1 text-xs text-surface-900 dark:text-surface-100 focus:outline-none focus:ring-2 focus:ring-brand-500 resize-none"
+                    @keydown.enter.exact.prevent="saveNotes(c.id)"
+                    @keydown.escape="cancelEditNotes"
+                  />
+                  <div class="flex flex-col gap-1 shrink-0">
+                    <button
+                      type="button"
+                      :disabled="isSavingNotes"
+                      class="rounded bg-brand-600 px-2 py-0.5 text-xs text-white hover:bg-brand-700 disabled:opacity-50 transition-colors"
+                      @click="saveNotes(c.id)"
+                    >Save</button>
+                    <button
+                      type="button"
+                      class="rounded border border-surface-300 dark:border-surface-700 px-2 py-0.5 text-xs text-surface-500 hover:text-surface-700 transition-colors"
+                      @click="cancelEditNotes"
+                    >Cancel</button>
+                  </div>
+                </div>
+                <button
+                  v-else
+                  type="button"
+                  class="group/notes flex items-start gap-1 text-left w-full min-h-[1.5rem]"
+                  @click="startEditNotes(c.id, c.quickNotes ?? null)"
+                >
+                  <StickyNote class="size-3.5 shrink-0 mt-0.5 text-surface-300 dark:text-surface-600 group-hover/notes:text-brand-500 transition-colors" />
+                  <span
+                    v-if="c.quickNotes"
+                    class="text-xs text-surface-600 dark:text-surface-400 line-clamp-2 group-hover/notes:text-surface-900 dark:group-hover/notes:text-surface-100 transition-colors"
+                  >{{ c.quickNotes }}</span>
+                  <span v-else class="text-xs text-surface-300 dark:text-surface-600 group-hover/notes:text-surface-400 transition-colors italic">Add note…</span>
+                </button>
+              </td>
             </tr>
           </tbody>
         </table>
diff --git a/app/pages/dashboard/jobs/[id]/settings.vue b/app/pages/dashboard/jobs/[id]/settings.vue
index f24d3af..64b4675 100644
--- a/app/pages/dashboard/jobs/[id]/settings.vue
+++ b/app/pages/dashboard/jobs/[id]/settings.vue
@@ -40,6 +40,7 @@ const form = ref({
   salaryUnit: '' as string,
   salaryNegotiable: false,
   remoteStatus: '' as string,
+  experienceLevel: '' as string,
   validThrough: '',
   requireResume: false,
   requireCoverLetter: false,
@@ -60,6 +61,7 @@ watch(job, (j) => {
       salaryUnit: j.salaryUnit ?? '',
       salaryNegotiable: j.salaryNegotiable ?? false,
       remoteStatus: j.remoteStatus ?? '',
+      experienceLevel: j.experienceLevel ?? '',
       validThrough: j.validThrough ? new Date(j.validThrough).toISOString().split('T')[0] ?? '' : '',
       requireResume: j.requireResume ?? false,
       requireCoverLetter: j.requireCoverLetter ?? false,
@@ -94,6 +96,7 @@ const editSchema = z.object({
   salaryUnit: z.enum(['YEAR', 'MONTH', 'HOUR']).optional().or(z.literal('')),
   salaryNegotiable: z.boolean().optional(),
   remoteStatus: z.enum(['remote', 'hybrid', 'onsite']).optional().or(z.literal('')),
+  experienceLevel: z.enum(['junior', 'mid', 'senior', 'lead']).optional().or(z.literal('')),
   validThrough: z.string().optional(),
   requireResume: z.boolean().optional(),
   requireCoverLetter: z.boolean().optional(),
@@ -134,6 +137,7 @@ async function handleSave() {
       salaryCurrency: form.value.salaryNegotiable ? null : (form.value.salaryCurrency || null),
       salaryUnit: form.value.salaryNegotiable ? null : (form.value.salaryUnit || null),
       remoteStatus: form.value.remoteStatus || null,
+      experienceLevel: (form.value.experienceLevel as 'junior' | 'mid' | 'senior' | 'lead' | null) || null,
       // Send null when cleared so the DB column is set to NULL
       validThrough: form.value.validThrough ? new Date(form.value.validThrough) : null,
     }
@@ -210,6 +214,14 @@ const remoteOptions = [
   { value: 'onsite', label: 'On-site' },
 ]
 
+const experienceLevelOptions = [
+  { value: '', label: 'Not specified' },
+  { value: 'junior', label: 'Junior' },
+  { value: 'mid', label: 'Mid-level' },
+  { value: 'senior', label: 'Senior' },
+  { value: 'lead', label: 'Lead' },
+]
+
 const salaryUnitOptions = [
   { value: '', label: 'Not specified' },
   { value: 'YEAR', label: 'Per year' },
@@ -335,6 +347,22 @@ function onSalaryMaxChange(e: Event) {
               </select>
             </div>
 
+            <!-- Experience Level -->
+            <div>
+              <label for="settings-experience-level" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
+                Experience Level
+              </label>
+              <select
+                id="settings-experience-level"
+                v-model="form.experienceLevel"
+                class="w-full rounded-lg border border-surface-300 dark:border-surface-700 px-3 py-2 text-sm text-surface-900 dark:text-surface-100 bg-white dark:bg-surface-800 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-brand-500 transition-colors"
+              >
+                <option v-for="opt in experienceLevelOptions" :key="opt.value" :value="opt.value">
+                  {{ opt.label }}
+                </option>
+              </select>
+            </div>
+
             <!-- Slug -->
             <div>
               <label for="settings-slug" class="block text-sm font-medium text-surface-700 dark:text-surface-300 mb-1">
diff --git a/app/pages/dashboard/jobs/new.vue b/app/pages/dashboard/jobs/new.vue
index 56bc7e4..03efff3 100644
--- a/app/pages/dashboard/jobs/new.vue
+++ b/app/pages/dashboard/jobs/new.vue
@@ -653,6 +653,7 @@ async function handleSubmit(mode: 'publish' | 'draft' = publishChoice.value) {
       description: form.value.description || undefined,
       location: form.value.location || undefined,
       type: form.value.type,
+      experienceLevel: form.value.experienceLevel || undefined,
       remoteStatus: form.value.remoteStatus || undefined,
       requireResume: applicationForm.value.requireResume,
       requireCoverLetter: applicationForm.value.requireCoverLetter,
diff --git a/server/api/candidates/[id].get.ts b/server/api/candidates/[id].get.ts
index 9ee946b..2b720f1 100644
--- a/server/api/candidates/[id].get.ts
+++ b/server/api/candidates/[id].get.ts
@@ -19,6 +19,7 @@ export default defineEventHandler(async (event) => {
       phone: true,
       gender: true,
       dateOfBirth: true,
+      quickNotes: true,
       createdAt: true,
       updatedAt: true,
     },
diff --git a/server/api/candidates/[id].patch.ts b/server/api/candidates/[id].patch.ts
index 37ca4e4..e464aef 100644
--- a/server/api/candidates/[id].patch.ts
+++ b/server/api/candidates/[id].patch.ts
@@ -39,6 +39,7 @@ export default defineEventHandler(async (event) => {
       phone: candidate.phone,
       gender: candidate.gender,
       dateOfBirth: candidate.dateOfBirth,
+      quickNotes: candidate.quickNotes,
       createdAt: candidate.createdAt,
       updatedAt: candidate.updatedAt,
     })
diff --git a/server/api/candidates/index.get.ts b/server/api/candidates/index.get.ts
index 1eccf6a..8223b41 100644
--- a/server/api/candidates/index.get.ts
+++ b/server/api/candidates/index.get.ts
@@ -1,4 +1,4 @@
-import { eq, and, or, ilike, desc, sql } from 'drizzle-orm'
+import { eq, and, or, ilike, desc, sql, gte, lte } from 'drizzle-orm'
 import { candidate, application } from '../../database/schema'
 import { candidateQuerySchema } from '../../utils/schemas/candidate'
 
@@ -28,6 +28,14 @@ export default defineEventHandler(async (event) => {
     conditions.push(eq(candidate.gender, query.gender))
   }
 
+  // dateOfBirth is stored as ISO 8601 text (YYYY-MM-DD), so lexicographic comparison works
+  if (query.dobFrom) {
+    conditions.push(gte(candidate.dateOfBirth, query.dobFrom))
+  }
+  if (query.dobTo) {
+    conditions.push(lte(candidate.dateOfBirth, query.dobTo))
+  }
+
   const where = and(...conditions)
 
   const [data, total] = await Promise.all([
@@ -41,6 +49,7 @@ export default defineEventHandler(async (event) => {
         phone: candidate.phone,
         gender: candidate.gender,
         dateOfBirth: candidate.dateOfBirth,
+        quickNotes: candidate.quickNotes,
         createdAt: candidate.createdAt,
         updatedAt: candidate.updatedAt,
         applicationCount: sql<number>`count(${application.id})::int`,
diff --git a/server/api/candidates/index.post.ts b/server/api/candidates/index.post.ts
index c74d2bc..5200e4d 100644
--- a/server/api/candidates/index.post.ts
+++ b/server/api/candidates/index.post.ts
@@ -33,6 +33,7 @@ export default defineEventHandler(async (event) => {
     phone: body.phone,
     gender: body.gender ?? null,
     dateOfBirth: body.dateOfBirth ?? null,
+    quickNotes: body.quickNotes ?? null,
   }).returning({
     id: candidate.id,
     firstName: candidate.firstName,
diff --git a/server/api/jobs/[id].get.ts b/server/api/jobs/[id].get.ts
index 28481db..95b6e0e 100644
--- a/server/api/jobs/[id].get.ts
+++ b/server/api/jobs/[id].get.ts
@@ -28,6 +28,7 @@ export default defineEventHandler(async (event) => {
       requireResume: true,
       requireCoverLetter: true,
       autoScoreOnApply: true,
+      experienceLevel: true,
       createdAt: true,
       updatedAt: true,
     },
diff --git a/server/api/jobs/[id].patch.ts b/server/api/jobs/[id].patch.ts
index beb874e..1cda516 100644
--- a/server/api/jobs/[id].patch.ts
+++ b/server/api/jobs/[id].patch.ts
@@ -58,6 +58,7 @@ export default defineEventHandler(async (event) => {
       requireResume: job.requireResume,
       requireCoverLetter: job.requireCoverLetter,
       autoScoreOnApply: job.autoScoreOnApply,
+      experienceLevel: job.experienceLevel,
       createdAt: job.createdAt,
       updatedAt: job.updatedAt,
     })
diff --git a/server/api/jobs/index.post.ts b/server/api/jobs/index.post.ts
index 0827348..bdba394 100644
--- a/server/api/jobs/index.post.ts
+++ b/server/api/jobs/index.post.ts
@@ -29,6 +29,7 @@ export default defineEventHandler(async (event) => {
     requireResume: body.requireResume,
     requireCoverLetter: body.requireCoverLetter,
     autoScoreOnApply: body.autoScoreOnApply,
+    experienceLevel: body.experienceLevel,
   }).returning({
     id: job.id,
     title: job.title,
@@ -47,6 +48,7 @@ export default defineEventHandler(async (event) => {
     requireResume: job.requireResume,
     requireCoverLetter: job.requireCoverLetter,
     autoScoreOnApply: job.autoScoreOnApply,
+    experienceLevel: job.experienceLevel,
     createdAt: job.createdAt,
     updatedAt: job.updatedAt,
   })
diff --git a/server/database/migrations/0023_job_experience_level.sql b/server/database/migrations/0023_job_experience_level.sql
new file mode 100644
index 0000000..8b0548f
--- /dev/null
+++ b/server/database/migrations/0023_job_experience_level.sql
@@ -0,0 +1,7 @@
+-- Migration: Add experience_level column to job table
+-- ──────────────────────────────────────────────────────────────────────────────
+
+CREATE TYPE "experience_level" AS ENUM('junior', 'mid', 'senior', 'lead');
+--> statement-breakpoint
+
+ALTER TABLE "job" ADD COLUMN "experience_level" "experience_level";
diff --git a/server/database/migrations/0024_candidate_quick_notes.sql b/server/database/migrations/0024_candidate_quick_notes.sql
new file mode 100644
index 0000000..f2bf0c5
--- /dev/null
+++ b/server/database/migrations/0024_candidate_quick_notes.sql
@@ -0,0 +1,4 @@
+-- Migration: Add quick_notes column to candidate table
+-- ──────────────────────────────────────────────────────────────────────────────
+
+ALTER TABLE "candidate" ADD COLUMN "quick_notes" text;
diff --git a/server/database/schema/app.ts b/server/database/schema/app.ts
index 0b0cb8d..80f1ae8 100644
--- a/server/database/schema/app.ts
+++ b/server/database/schema/app.ts
@@ -28,6 +28,7 @@ export const questionTypeEnum = pgEnum('question_type', [
   'number', 'date', 'url', 'checkbox', 'file_upload',
 ])
 export const genderEnum = pgEnum('gender', ['male', 'female', 'other', 'prefer_not_to_say'])
+export const experienceLevelEnum = pgEnum('experience_level', ['junior', 'mid', 'senior', 'lead'])
 export const nameDisplayFormatEnum = pgEnum('name_display_format', ['first_last', 'last_first'])
 export const dateFormatEnum = pgEnum('date_format', ['mdy', 'dmy', 'ymd'])
 
@@ -55,6 +56,8 @@ export const job = pgTable('job', {
   salaryNegotiable: boolean('salary_negotiable').notNull().default(false),
   remoteStatus: text('remote_status'),
   validThrough: timestamp('valid_through'),
+  /** Experience level required for this role */
+  experienceLevel: experienceLevelEnum('experience_level'),
   // ── Application form settings ──
   requireResume: boolean('require_resume').notNull().default(false),
   requireCoverLetter: boolean('require_cover_letter').notNull().default(false),
@@ -83,6 +86,8 @@ export const candidate = pgTable('candidate', {
   gender: genderEnum('gender'),
   /** Date of birth — stored as text in ISO 8601 format (YYYY-MM-DD) to avoid timezone issues */
   dateOfBirth: text('date_of_birth'),
+  /** Quick notes visible inline on the candidates list */
+  quickNotes: text('quick_notes'),
   createdAt: timestamp('created_at').notNull().defaultNow(),
   updatedAt: timestamp('updated_at').notNull().defaultNow(),
 }, (t) => ([
diff --git a/server/utils/schemas/candidate.ts b/server/utils/schemas/candidate.ts
index 54d0961..35288c6 100644
--- a/server/utils/schemas/candidate.ts
+++ b/server/utils/schemas/candidate.ts
@@ -32,6 +32,7 @@ export const createCandidateSchema = z.object({
   phone: z.string().max(50).optional(),
   gender: z.enum(genderValues).optional(),
   dateOfBirth: dobSchema.optional(),
+  quickNotes: z.string().max(1000).optional(),
 })
 
 /** Schema for updating an existing candidate (all fields optional) */
@@ -48,6 +49,7 @@ export const updateCandidateSchema = z.object({
   phone: z.string().max(50).nullish(),
   gender: z.enum(genderValues).nullish(),
   dateOfBirth: dobSchema.nullish(),
+  quickNotes: z.string().max(1000).nullish(),
 })
 
 /** Schema for candidate list query params */
@@ -56,6 +58,8 @@ export const candidateQuerySchema = z.object({
   limit: z.coerce.number().int().min(1).max(100).default(20),
   search: z.string().trim().max(200).optional(),
   gender: z.enum(genderValues).optional(),
+  dobFrom: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'dobFrom must be YYYY-MM-DD').optional(),
+  dobTo: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'dobTo must be YYYY-MM-DD').optional(),
 })
 
 /** Reusable schema for `:id` route params */
diff --git a/server/utils/schemas/job.ts b/server/utils/schemas/job.ts
index 25d8c08..537ceef 100644
--- a/server/utils/schemas/job.ts
+++ b/server/utils/schemas/job.ts
@@ -31,6 +31,8 @@ export const createJobSchema = z.object({
   requireCoverLetter: z.boolean().optional().default(false),
   /** Whether to automatically run AI scoring when a candidate applies */
   autoScoreOnApply: z.boolean().optional().default(false),
+  /** Experience level required for this role */
+  experienceLevel: z.enum(['junior', 'mid', 'senior', 'lead']).optional(),
 })
 
 /** Schema for updating an existing job (all fields optional, no defaults — PATCH semantics) */
@@ -51,7 +53,10 @@ export const updateJobSchema = z.object({
   validThrough: z.coerce.date().nullable().optional(),
   requireResume: z.boolean().optional(),
   requireCoverLetter: z.boolean().optional(),
+  /** Whether to automatically run AI scoring when a candidate applies */
   autoScoreOnApply: z.boolean().optional(),
+  /** Experience level required for this role */
+  experienceLevel: z.enum(['junior', 'mid', 'senior', 'lead']).nullable().optional(),
   status: z.enum(['draft', 'open', 'closed', 'archived']).optional(),
 })
 

From 93ed4b1cd341e3f8cb7d541fd7dd595241dd618b Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 17:40:57 +0200
Subject: [PATCH 6/7] fix: register migrations 0023 and 0024 in drizzle journal

Migrations 0023_job_experience_level.sql and 0024_candidate_quick_notes.sql
were added as SQL files but never registered in _journal.json, so drizzle-kit
migrate skipped them. On a fresh database the job.experience_level and
candidate.quick_notes columns were never created, causing the seed script to
fail with 'column experience_level of relation job does not exist'.
---
 server/database/migrations/meta/_journal.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/server/database/migrations/meta/_journal.json b/server/database/migrations/meta/_journal.json
index 46797ce..9ce3f19 100644
--- a/server/database/migrations/meta/_journal.json
+++ b/server/database/migrations/meta/_journal.json
@@ -162,6 +162,20 @@
       "when": 1776450000000,
       "tag": "0022_salary_negotiable",
       "breakpoints": true
+    },
+    {
+      "idx": 23,
+      "version": "7",
+      "when": 1776500000000,
+      "tag": "0023_job_experience_level",
+      "breakpoints": true
+    },
+    {
+      "idx": 24,
+      "version": "7",
+      "when": 1776550000000,
+      "tag": "0024_candidate_quick_notes",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file

From 0eec67a852506f9d2f4c0b9098f578f551901104 Mon Sep 17 00:00:00 2001
From: JoachimLK <joachim.l.kolle.pers@gmail.com>
Date: Fri, 24 Apr 2026 20:32:46 +0200
Subject: [PATCH 7/7] Refactor code structure for improved readability and
 maintainability

---
 .gitignore                                    |  1 +
 app/components/ApplyCandidateModal.vue        |  3 +-
 app/components/CandidateDetailSidebar.vue     |  5 ++-
 app/components/InterviewEmailModal.vue        |  3 +-
 app/components/PipelineCard.vue               |  6 ++-
 app/composables/useOrgSettings.ts             | 39 +++++++++++++++++--
 app/pages/dashboard/applications/[id].vue     |  6 ++-
 app/pages/dashboard/applications/index.vue    |  9 +++--
 app/pages/dashboard/candidates/index.vue      |  9 +++--
 app/pages/dashboard/index.vue                 |  5 ++-
 app/pages/dashboard/interviews/[id].vue       |  5 ++-
 app/pages/dashboard/interviews/index.vue      |  5 ++-
 app/pages/dashboard/jobs/[id]/candidates.vue  |  4 +-
 app/pages/dashboard/jobs/[id]/index.vue       |  5 ++-
 app/pages/dashboard/source-tracking/[id].vue  |  3 +-
 app/pages/dashboard/source-tracking/index.vue |  5 ++-
 16 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0a1fec..b53fecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ test-results/
 playwright-report/
 blob-report/
 playwright/.cache/
+.playwright-mcp/
 
 
 *.code-workspace
diff --git a/app/components/ApplyCandidateModal.vue b/app/components/ApplyCandidateModal.vue
index 09a9851..9fc9b78 100644
--- a/app/components/ApplyCandidateModal.vue
+++ b/app/components/ApplyCandidateModal.vue
@@ -37,6 +37,7 @@ const { data: candidateData, status: searchStatus } = useFetch('/api/candidates'
 
 const candidates = computed(() => candidateData.value?.data ?? [])
 const { handlePreviewReadOnlyError } = usePreviewReadOnly()
+const { formatCandidateName } = useOrgSettings()
 
 // Apply candidate
 const isApplying = ref(false)
@@ -117,7 +118,7 @@ async function applyCandidate(candidateId: string) {
             >
               <div class="min-w-0">
                 <p class="text-sm font-medium text-surface-900 dark:text-surface-100 truncate">
-                  {{ c.firstName }} {{ c.lastName }}
+                  {{ formatCandidateName(c) }}
                 </p>
                 <p class="text-xs text-surface-400 truncate">{{ c.email }}</p>
               </div>
diff --git a/app/components/CandidateDetailSidebar.vue b/app/components/CandidateDetailSidebar.vue
index 31f60f6..d97d82d 100644
--- a/app/components/CandidateDetailSidebar.vue
+++ b/app/components/CandidateDetailSidebar.vue
@@ -19,6 +19,7 @@ const emit = defineEmits<{
 const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 const toast = useToast()
 const { track } = useTrack()
+const { formatCandidateName } = useOrgSettings()
 
 // Detect if the job sub-nav bar is visible (adds 40px / 2.5rem)
 const route = useRoute()
@@ -467,7 +468,7 @@ function formatInterviewDate(dateStr: string) {
             </div>
             <div class="min-w-0">
               <h2 class="text-lg font-semibold text-surface-900 dark:text-surface-50 truncate">
-                {{ application.candidate.firstName }} {{ application.candidate.lastName }}
+                {{ formatCandidateName(application.candidate) }}
               </h2>
               <div class="flex items-center gap-3 text-sm text-surface-500 dark:text-surface-400">
                 <a
@@ -617,7 +618,7 @@ function formatInterviewDate(dateStr: string) {
                 <div>
                   <dt class="text-xs font-medium text-surface-400 dark:text-surface-500 mb-1">Name</dt>
                   <dd class="text-surface-800 dark:text-surface-200 font-medium">
-                    {{ application.candidate.firstName }} {{ application.candidate.lastName }}
+                    {{ formatCandidateName(application.candidate) }}
                   </dd>
                 </div>
                 <div>
diff --git a/app/components/InterviewEmailModal.vue b/app/components/InterviewEmailModal.vue
index 9666c7b..a64757a 100644
--- a/app/components/InterviewEmailModal.vue
+++ b/app/components/InterviewEmailModal.vue
@@ -16,6 +16,7 @@ const emit = defineEmits<{
 }>()
 
 const { templates, createTemplate, deleteTemplate, sendInvitation } = useEmailTemplates()
+const { formatPersonName } = useOrgSettings()
 
 // ─── System templates (from shared utility — auto-imported) ────
 
@@ -171,7 +172,7 @@ const canSend = computed(() => {
                   Send Interview Invitation
                 </h2>
                 <p class="text-xs text-surface-500 dark:text-surface-400">
-                  to {{ interview.candidateFirstName }} {{ interview.candidateLastName }} · {{ interview.candidateEmail }}
+                  to {{ formatPersonName(interview.candidateFirstName, interview.candidateLastName) }} · {{ interview.candidateEmail }}
                 </p>
               </div>
             </div>
diff --git a/app/components/PipelineCard.vue b/app/components/PipelineCard.vue
index c3a9750..1c84716 100644
--- a/app/components/PipelineCard.vue
+++ b/app/components/PipelineCard.vue
@@ -33,6 +33,8 @@ const transitionClasses: Record<string, string> = {
   hired: 'text-green-700 dark:text-green-300 hover:bg-green-100 dark:hover:bg-green-900',
   rejected: 'text-danger-600 dark:text-danger-400 hover:bg-danger-50 dark:hover:bg-danger-950',
 }
+
+const { formatPersonName, formatDateTime } = useOrgSettings()
 </script>
 
 <template>
@@ -42,7 +44,7 @@ const transitionClasses: Record<string, string> = {
       class="block mb-2 group"
     >
       <h4 class="text-sm font-semibold text-surface-900 dark:text-surface-100 group-hover:text-brand-600 dark:group-hover:text-brand-400 transition-colors truncate">
-        {{ candidateFirstName }} {{ candidateLastName }}
+        {{ formatPersonName(candidateFirstName, candidateLastName) }}
       </h4>
       <div class="flex items-center gap-2 text-xs text-surface-400 mt-0.5">
         <a
@@ -60,7 +62,7 @@ const transitionClasses: Record<string, string> = {
     <div class="flex items-center justify-between text-xs text-surface-400">
       <span class="inline-flex items-center gap-1">
         <Calendar class="size-3" />
-        {{ new Date(createdAt).toLocaleDateString() }}
+        {{ formatDateTime(createdAt) }}
       </span>
       <span v-if="score != null" class="inline-flex items-center rounded-md px-1.5 py-0.5 text-[10px] font-semibold ring-1 ring-inset"
         :class="score >= 75
diff --git a/app/composables/useOrgSettings.ts b/app/composables/useOrgSettings.ts
index 4e88b14..9ff6a10 100644
--- a/app/composables/useOrgSettings.ts
+++ b/app/composables/useOrgSettings.ts
@@ -16,15 +16,44 @@ export function useOrgSettings() {
    * Falls back to "First Last" if displayName is not set.
    */
   function formatCandidateName(candidate: {
-    firstName: string
-    lastName: string
+    firstName?: string | null
+    lastName?: string | null
     displayName?: string | null
   }): string {
     if (candidate.displayName?.trim()) return candidate.displayName.trim()
+    return formatPersonName(candidate.firstName, candidate.lastName)
+  }
+
+  /**
+   * Format a person's name from first/last parts according to the org's
+   * display preference. Use for shapes that don't carry a `displayName`
+   * (e.g. flattened API rows like `candidateFirstName` / `candidateLastName`).
+   */
+  function formatPersonName(
+    firstName: string | null | undefined,
+    lastName: string | null | undefined,
+    displayName?: string | null
+  ): string {
+    if (displayName?.trim()) return displayName.trim()
+    const first = (firstName ?? '').trim()
+    const last = (lastName ?? '').trim()
+    if (!first && !last) return ''
+    if (!first) return last
+    if (!last) return first
     if (nameDisplayFormat.value === 'last_first') {
-      return `${candidate.lastName} ${candidate.firstName}`
+      return `${last} ${first}`
     }
-    return `${candidate.firstName} ${candidate.lastName}`
+    return `${first} ${last}`
+  }
+
+  /**
+   * Format a full ISO timestamp (or Date) according to the org's date format.
+   * Returns an empty string for null/undefined values.
+   */
+  function formatDateTime(value: string | Date | null | undefined): string {
+    if (!value) return ''
+    const iso = typeof value === 'string' ? value : value.toISOString()
+    return formatDate(iso.slice(0, 10))
   }
 
   /**
@@ -59,7 +88,9 @@ export function useOrgSettings() {
     dateFormat,
     status,
     formatCandidateName,
+    formatPersonName,
     formatDate,
+    formatDateTime,
     updateSettings,
     refresh,
   }
diff --git a/app/pages/dashboard/applications/[id].vue b/app/pages/dashboard/applications/[id].vue
index 5f29880..c67ef56 100644
--- a/app/pages/dashboard/applications/[id].vue
+++ b/app/pages/dashboard/applications/[id].vue
@@ -14,6 +14,8 @@ const toast = useToast()
 
 const { application, status: fetchStatus, error, updateApplication } = useApplication(applicationId)
 
+const { formatCandidateName } = useOrgSettings()
+
 useSeoMeta({
   title: computed(() =>
     application.value
@@ -154,7 +156,7 @@ function formatResponseValue(value: unknown): string {
         </p>
         <div class="mb-2 flex flex-wrap items-center gap-2 text-surface-400">
           <h1 class="text-2xl font-bold text-surface-900 dark:text-surface-50 truncate">
-            {{ application.candidate.firstName }} {{ application.candidate.lastName }}
+            {{ formatCandidateName(application.candidate) }}
           </h1>
           <span class="text-surface-400">→</span>
           <NuxtLink
@@ -220,7 +222,7 @@ function formatResponseValue(value: unknown): string {
                   :to="$localePath(`/dashboard/candidates/${application.candidate.id}`)"
                   class="text-brand-600 hover:text-brand-700 dark:text-brand-400 dark:hover:text-brand-300 transition-colors"
                 >
-                  {{ application.candidate.firstName }} {{ application.candidate.lastName }}
+                  {{ formatCandidateName(application.candidate) }}
                 </NuxtLink>
               </dd>
             </div>
diff --git a/app/pages/dashboard/applications/index.vue b/app/pages/dashboard/applications/index.vue
index 5754f8d..6d5acee 100644
--- a/app/pages/dashboard/applications/index.vue
+++ b/app/pages/dashboard/applications/index.vue
@@ -59,6 +59,8 @@ const { applications, total, fetchStatus, error, refresh } = useApplications({
   status: statusFilter,
 })
 
+const { formatPersonName } = useOrgSettings()
+
 // ── Job filter (client-side) ──────────────────────────────────────────────────
 
 const activeJobId = ref<string | undefined>(undefined)
@@ -112,7 +114,8 @@ const filteredApplications = computed(() => {
   if (debouncedSearch.value) {
     const q = debouncedSearch.value
     list = list.filter(app =>
-      `${app.candidateFirstName} ${app.candidateLastName}`.toLowerCase().includes(q)
+      formatPersonName(app.candidateFirstName, app.candidateLastName).toLowerCase().includes(q)
+      || `${app.candidateFirstName} ${app.candidateLastName}`.toLowerCase().includes(q)
       || app.candidateEmail.toLowerCase().includes(q)
       || app.jobTitle.toLowerCase().includes(q),
     )
@@ -123,7 +126,7 @@ const filteredApplications = computed(() => {
   list.sort((a, b) => {
     switch (sortKey.value) {
       case 'name':
-        return dir * `${a.candidateFirstName} ${a.candidateLastName}`.localeCompare(`${b.candidateFirstName} ${b.candidateLastName}`)
+        return dir * formatPersonName(a.candidateFirstName, a.candidateLastName).localeCompare(formatPersonName(b.candidateFirstName, b.candidateLastName))
       case 'email':
         return dir * a.candidateEmail.localeCompare(b.candidateEmail)
       case 'job':
@@ -408,7 +411,7 @@ const statusLabels: Record<Status, string> = {
                   :to="$localePath(`/dashboard/applications/${app.id}`)"
                   class="font-semibold text-surface-900 dark:text-surface-100 group-hover:text-brand-600 transition-colors whitespace-nowrap"
                 >
-                  {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                  {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                 </NuxtLink>
               </td>
               <td class="px-4 py-3 text-surface-500 dark:text-surface-400 hidden lg:table-cell">
diff --git a/app/pages/dashboard/candidates/index.vue b/app/pages/dashboard/candidates/index.vue
index fd912a7..cdf4260 100644
--- a/app/pages/dashboard/candidates/index.vue
+++ b/app/pages/dashboard/candidates/index.vue
@@ -46,6 +46,9 @@ const { candidates, total, fetchStatus, error, refresh } = useCandidates({
   dobTo: filterDobTo,
 })
 
+// Org localization (name + date format)
+const { formatCandidateName, formatDateTime } = useOrgSettings()
+
 // ── Sorting ───────────────────────────────────────────────────────────────────
 
 type SortKey = 'name' | 'email' | 'phone' | 'applications' | 'created'
@@ -70,7 +73,7 @@ const sortedCandidates = computed(() => {
   list.sort((a, b) => {
     switch (sortKey.value) {
       case 'name':
-        return dir * `${a.firstName} ${a.lastName}`.localeCompare(`${b.firstName} ${b.lastName}`)
+        return dir * formatCandidateName(a).localeCompare(formatCandidateName(b))
       case 'email':
         return dir * a.email.localeCompare(b.email)
       case 'phone':
@@ -315,7 +318,7 @@ function cancelEditNotes() {
                   :to="$localePath(`/dashboard/candidates/${c.id}`)"
                   class="font-semibold text-surface-900 dark:text-surface-100 group-hover:text-brand-600 transition-colors whitespace-nowrap"
                 >
-                  {{ c.firstName }} {{ c.lastName }}
+                  {{ formatCandidateName(c) }}
                 </NuxtLink>
               </td>
               <td class="px-4 py-3 text-surface-500 dark:text-surface-400">
@@ -345,7 +348,7 @@ function cancelEditNotes() {
                 <span v-else class="text-surface-300 dark:text-surface-600">0</span>
               </td>
               <td class="px-4 py-3 text-surface-500 dark:text-surface-400 whitespace-nowrap">
-                <TimelineDateLink :date="c.createdAt">{{ new Date(c.createdAt).toLocaleDateString() }}</TimelineDateLink>
+                <TimelineDateLink :date="c.createdAt">{{ formatDateTime(c.createdAt) }}</TimelineDateLink>
               </td>
               <!-- Quick notes — inline editable -->
               <td class="px-4 py-3 hidden lg:table-cell" @click.stop>
diff --git a/app/pages/dashboard/index.vue b/app/pages/dashboard/index.vue
index 83e524b..e5141e1 100644
--- a/app/pages/dashboard/index.vue
+++ b/app/pages/dashboard/index.vue
@@ -19,6 +19,7 @@ useSeoMeta({
 const { activeOrg } = useCurrentOrg()
 const localePath = useLocalePath()
 const { track } = useTrack()
+const { formatPersonName } = useOrgSettings()
 
 onMounted(() => track('dashboard_viewed'))
 
@@ -458,7 +459,7 @@ const isEmpty = computed(() =>
                 <div class="min-w-0 flex-1">
                   <div class="flex items-center gap-2 mb-0.5">
                     <span class="text-sm font-medium text-surface-900 dark:text-surface-100 truncate group-hover:text-brand-600 dark:group-hover:text-brand-400 transition-colors">
-                      {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                      {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                     </span>
                     <span
                       class="inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-semibold capitalize shrink-0 ring-1 ring-inset"
@@ -518,7 +519,7 @@ const isEmpty = computed(() =>
               >
                 <div class="flex items-center justify-between mb-1.5">
                   <span class="text-sm font-medium text-surface-900 dark:text-surface-100 truncate group-hover:text-brand-600 dark:group-hover:text-brand-400 transition-colors">
-                    {{ interview.candidateFirstName }} {{ interview.candidateLastName }}
+                    {{ formatPersonName(interview.candidateFirstName, interview.candidateLastName) }}
                   </span>
                   <span class="inline-flex items-center rounded-full bg-brand-50 dark:bg-brand-950/40 px-2 py-0.5 text-[10px] font-semibold text-brand-700 dark:text-brand-400 shrink-0 ml-2">
                     {{ formatRelativeDate(interview.scheduledAt) }}
diff --git a/app/pages/dashboard/interviews/[id].vue b/app/pages/dashboard/interviews/[id].vue
index 5cbdccd..2d0c750 100644
--- a/app/pages/dashboard/interviews/[id].vue
+++ b/app/pages/dashboard/interviews/[id].vue
@@ -18,6 +18,7 @@ const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 const toast = useToast()
 const { activeOrg } = useCurrentOrg()
 const { track } = useTrack()
+const { formatPersonName } = useOrgSettings()
 
 const { interview, status: fetchStatus, error, updateInterview, deleteInterview, refresh } = useInterview(interviewId)
 
@@ -408,7 +409,7 @@ const localePath = useLocalePath()
                   class="inline-flex items-center gap-1.5 hover:text-brand-600 dark:hover:text-brand-400 transition-colors group"
                 >
                   <UserRound class="size-4" />
-                  {{ interview.candidateFirstName }} {{ interview.candidateLastName }}
+                  {{ formatPersonName(interview.candidateFirstName, interview.candidateLastName) }}
                   <ExternalLink class="size-3 opacity-0 group-hover:opacity-100 transition-opacity" />
                 </NuxtLink>
                 <NuxtLink
@@ -704,7 +705,7 @@ const localePath = useLocalePath()
             <div>
               <dt class="text-surface-400">Name</dt>
               <dd class="text-surface-700 dark:text-surface-200 font-medium">
-                {{ interview.candidateFirstName }} {{ interview.candidateLastName }}
+                {{ formatPersonName(interview.candidateFirstName, interview.candidateLastName) }}
               </dd>
             </div>
             <div>
diff --git a/app/pages/dashboard/interviews/index.vue b/app/pages/dashboard/interviews/index.vue
index b341806..9aa922e 100644
--- a/app/pages/dashboard/interviews/index.vue
+++ b/app/pages/dashboard/interviews/index.vue
@@ -20,6 +20,7 @@ useSeoMeta({
 
 const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 const toast = useToast()
+const { formatPersonName, formatDateTime } = useOrgSettings()
 
 // ─── Filters ──────────────────────────────────────────────────────
 const searchInput = ref('')
@@ -475,7 +476,7 @@ const statusCounts = computed(() => {
                 <div class="mt-1 flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-surface-500 dark:text-surface-400">
                   <span class="inline-flex items-center gap-1">
                     <UserRound class="size-3.5" />
-                    {{ interviewItem.candidateFirstName }} {{ interviewItem.candidateLastName }}
+                    {{ formatPersonName(interviewItem.candidateFirstName, interviewItem.candidateLastName) }}
                   </span>
                   <span class="inline-flex items-center gap-1">
                     <Briefcase class="size-3.5" />
@@ -644,7 +645,7 @@ const statusCounts = computed(() => {
                   <div class="mt-1.5 flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs text-surface-500 dark:text-surface-400">
                     <span class="inline-flex items-center gap-1">
                       <UserRound class="size-3" />
-                      {{ interviewItem.candidateFirstName }} {{ interviewItem.candidateLastName }}
+                      {{ formatPersonName(interviewItem.candidateFirstName, interviewItem.candidateLastName) }}
                     </span>
                     <span class="inline-flex items-center gap-1">
                       <component :is="typeIcons[interviewItem.type]" class="size-3" />
diff --git a/app/pages/dashboard/jobs/[id]/candidates.vue b/app/pages/dashboard/jobs/[id]/candidates.vue
index f6cd4f4..deaeb42 100644
--- a/app/pages/dashboard/jobs/[id]/candidates.vue
+++ b/app/pages/dashboard/jobs/[id]/candidates.vue
@@ -9,6 +9,8 @@ definePageMeta({
 const route = useRoute()
 const jobId = route.params.id as string
 
+const { formatPersonName } = useOrgSettings()
+
 // ─────────────────────────────────────────────
 // Fetch job info for page header
 // ─────────────────────────────────────────────
@@ -493,7 +495,7 @@ const isLoading = computed(() => jobFetchStatus.value === 'pending' || appFetchS
                       {{ getCandidateInitials(app.candidateFirstName, app.candidateLastName) }}
                     </div>
                     <span class="font-medium text-surface-900 dark:text-surface-100">
-                      {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                      {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                     </span>
                   </div>
                 </td>
diff --git a/app/pages/dashboard/jobs/[id]/index.vue b/app/pages/dashboard/jobs/[id]/index.vue
index f7103f6..aaa688d 100644
--- a/app/pages/dashboard/jobs/[id]/index.vue
+++ b/app/pages/dashboard/jobs/[id]/index.vue
@@ -21,6 +21,7 @@ const jobId = route.params.id as string
 const { handlePreviewReadOnlyError } = usePreviewReadOnly()
 const { track } = useTrack()
 const toast = useToast()
+const { formatPersonName } = useOrgSettings()
 
 // ─────────────────────────────────────────────
 // Job data (with update/delete support)
@@ -1643,7 +1644,7 @@ function closeDocPreview() {
               </div>
               <div class="min-w-0 flex-1">
                 <p class="truncate text-sm font-medium text-surface-900 dark:text-surface-100">
-                  {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                  {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                 </p>
                 <p class="mt-0.5 block truncate text-xs text-surface-500 dark:text-surface-400">{{ app.candidateEmail }}</p>
                 <div class="mt-1.5 flex items-center gap-2">
@@ -1721,7 +1722,7 @@ function closeDocPreview() {
                   <div class="min-w-0">
                     <div class="flex items-center gap-2.5">
                       <h2 class="text-xl font-semibold tracking-tight text-surface-900 dark:text-surface-50 truncate">
-                        {{ currentSummary.candidateFirstName }} {{ currentSummary.candidateLastName }}
+                        {{ formatPersonName(currentSummary.candidateFirstName, currentSummary.candidateLastName) }}
                       </h2>
                       <span
                         class="inline-flex shrink-0 items-center rounded-lg px-2.5 py-1 text-[11px] font-semibold uppercase tracking-wide ring-1 ring-inset"
diff --git a/app/pages/dashboard/source-tracking/[id].vue b/app/pages/dashboard/source-tracking/[id].vue
index 66c8324..e4e911d 100644
--- a/app/pages/dashboard/source-tracking/[id].vue
+++ b/app/pages/dashboard/source-tracking/[id].vue
@@ -16,6 +16,7 @@ const route = useRoute()
 const localePath = useLocalePath()
 const toast = useToast()
 const { track } = useTrack()
+const { formatPersonName } = useOrgSettings()
 
 const linkId = computed(() => route.params.id as string)
 
@@ -754,7 +755,7 @@ async function handleSidebarUpdated() {
                         class="text-sm font-medium text-surface-800 dark:text-surface-200 hover:text-brand-600 dark:hover:text-brand-400 truncate no-underline transition-colors block"
                         @click.stop
                       >
-                        {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                        {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                       </NuxtLink>
                       <div class="text-[11px] text-surface-400 truncate">{{ app.candidateEmail }}</div>
                     </div>
diff --git a/app/pages/dashboard/source-tracking/index.vue b/app/pages/dashboard/source-tracking/index.vue
index eb77ce1..838eedf 100644
--- a/app/pages/dashboard/source-tracking/index.vue
+++ b/app/pages/dashboard/source-tracking/index.vue
@@ -21,6 +21,7 @@ useSeoMeta({
 const localePath = useLocalePath()
 const { track } = useTrack()
 const toast = useToast()
+const { formatPersonName } = useOrgSettings()
 
 onMounted(() => track('source_tracking_viewed'))
 
@@ -814,7 +815,7 @@ const showTab = ref<'overview' | 'links' | 'table'>(initialTab)
                   </div>
                   <div class="min-w-0 flex-1">
                     <div class="text-sm font-medium text-surface-800 dark:text-surface-200 truncate">
-                      {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                      {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                     </div>
                     <div class="text-xs text-surface-400 truncate">{{ app.jobTitle }}</div>
                   </div>
@@ -1032,7 +1033,7 @@ const showTab = ref<'overview' | 'links' | 'table'>(initialTab)
                       </div>
                       <div class="min-w-0">
                         <div class="text-sm font-medium text-surface-800 dark:text-surface-200 truncate group-hover/candidate:text-brand-600 dark:group-hover/candidate:text-brand-400 transition-colors">
-                          {{ app.candidateFirstName }} {{ app.candidateLastName }}
+                          {{ formatPersonName(app.candidateFirstName, app.candidateLastName) }}
                         </div>
                         <div class="text-[11px] text-surface-400 truncate">{{ app.candidateEmail }}</div>
                       </div>