diff --git a/src/lib/schemas/clients.schema.ts b/src/lib/schemas/clients.schema.ts
index f82c641..1b95d2d 100644
--- a/src/lib/schemas/clients.schema.ts
+++ b/src/lib/schemas/clients.schema.ts
@@ -14,11 +14,8 @@ export const clientEditSchema = clientCreateSchema.extend(idSchema.shape);
 export const clientOnboardingCreateSchema = clientCreateSchema.extend({
 	primaryContactName: requiredText('Primary contact name'),
 	primaryContactRole: optionalText(120),
-	primaryContactEmail: optionalEmail,
+	primaryContactEmail: z.string().trim().email('Enter a valid primary contact email address.'),
 	primaryContactPhone: optionalText(80),
-	primaryContactReceivesInvoices: z.enum(['true', 'false']).default('false'),
-	primaryContactReceivesContracts: z.enum(['true', 'false']).default('false'),
-	primaryAddressType: z.enum(['primary', 'invoicing', 'contract']).default('primary'),
 	primaryAddressLine1: requiredText('Address line 1'),
 	primaryAddressLine2: optionalText(160),
 	primaryAddressLine3: optionalText(160),
diff --git a/src/routes/dashboard/clients/+page.server.ts b/src/routes/dashboard/clients/+page.server.ts
index 20d7f01..24124b4 100644
--- a/src/routes/dashboard/clients/+page.server.ts
+++ b/src/routes/dashboard/clients/+page.server.ts
@@ -75,11 +75,11 @@ export const actions: Actions = {
 		if (!form.valid) return message(form, 'Check the highlighted fields.', { status: 400 });
 
 		try {
-			await db.transaction(async (tx) => {
-				const clientId = crypto.randomUUID();
-				const now = new Date();
+			const clientId = crypto.randomUUID();
+			const now = new Date();
 
-				await tx.insert(clients).values({
+			await db.batch([
+				db.insert(clients).values({
 					id: clientId,
 					organizationId: activeOrganizationId,
 					name: form.data.name,
@@ -88,9 +88,9 @@ export const actions: Actions = {
 					notes: form.data.notes || null,
 					updatedAt: now,
 					createdAt: now
-				});
+				}),
 
-				await tx.insert(contacts).values({
+				db.insert(contacts).values({
 					id: crypto.randomUUID(),
 					organizationId: activeOrganizationId,
 					clientId,
@@ -99,17 +99,17 @@ export const actions: Actions = {
 					email: form.data.primaryContactEmail || null,
 					phone: form.data.primaryContactPhone || null,
 					isPrimary: true,
-					receivesInvoices: form.data.primaryContactReceivesInvoices === 'true',
-					receivesContracts: form.data.primaryContactReceivesContracts === 'true',
+					receivesInvoices: true,
+					receivesContracts: true,
 					createdAt: now,
 					updatedAt: now
-				});
+				}),
 
-				await tx.insert(addresses).values({
+				db.insert(addresses).values({
 					id: crypto.randomUUID(),
 					organizationId: activeOrganizationId,
 					clientId,
-					type: form.data.primaryAddressType,
+					type: 'primary',
 					line1: form.data.primaryAddressLine1,
 					line2: form.data.primaryAddressLine2 || null,
 					line3: form.data.primaryAddressLine3 || null,
@@ -119,9 +119,10 @@ export const actions: Actions = {
 					country: form.data.primaryAddressCountry,
 					createdAt: now,
 					updatedAt: now
-				});
-			});
-		} catch {
+				})
+			]);
+		} catch (cause) {
+			console.error('Unable to create client', cause);
 			return message(form, 'Unable to create client.', { status: 400 });
 		}
 
diff --git a/src/routes/dashboard/clients/create-client-dialog.svelte b/src/routes/dashboard/clients/create-client-dialog.svelte
index f95d923..7633322 100644
--- a/src/routes/dashboard/clients/create-client-dialog.svelte
+++ b/src/routes/dashboard/clients/create-client-dialog.svelte
@@ -3,7 +3,6 @@
 	import PlusIcon from '@lucide/svelte/icons/plus';
 	import { Field as FormField, Control, FieldErrors } from 'formsnap';
 	import FormSelect from '$lib/components/form-select.svelte';
-	import FormCheckbox from '$lib/components/form-checkbox.svelte';
 	import { industryOptions } from '$lib/constants/industries';
 	import * as Field from '$lib/components/ui/field/index.js';
 	import { Button } from '$lib/components/ui/button/index.js';
@@ -66,7 +65,7 @@
 						<Control id="create-name">
 							{#snippet children({ props })}
 								<Field.Label>Name</Field.Label>
-								<Input {...props} type="text" bind:value={$createData.name} />
+								<Input {...props} type="text" required bind:value={$createData.name} />
 							{/snippet}
 						</Control>
 						<Field.Error><FieldErrors /></Field.Error>
@@ -144,7 +143,12 @@
 						<Control id="create-primary-contact-email">
 							{#snippet children({ props })}
 								<Field.Label>Email</Field.Label>
-								<Input {...props} type="email" bind:value={$createData.primaryContactEmail} />
+								<Input
+									{...props}
+									type="email"
+									required
+									bind:value={$createData.primaryContactEmail}
+								/>
 							{/snippet}
 						</Control>
 						<Field.Error><FieldErrors /></Field.Error>
@@ -161,50 +165,19 @@
 						<Field.Error><FieldErrors /></Field.Error>
 					</Field.Field>
 				</FormField>
-				<div class="grid gap-3 py-1">
-					<FormCheckbox
-						id="create-primary-contact-receives-invoices"
-						name="primaryContactReceivesInvoices"
-						label="Receives invoices"
-						description="Send invoices raised for this client to this contact."
-						bind:value={$createData.primaryContactReceivesInvoices}
-					/>
-					<FormCheckbox
-						id="create-primary-contact-receives-contracts"
-						name="primaryContactReceivesContracts"
-						label="Receives contracts"
-						description="Send contract documents for this client to this contact."
-						bind:value={$createData.primaryContactReceivesContracts}
-					/>
-				</div>
 			</div>
 			<div class={['grid gap-2', createStep !== 1 && 'hidden']}>
-				<FormField form={createForm} name="primaryAddressType">
-					<Field.Field>
-						<Control id="create-primary-address-type">
-							{#snippet children({ props })}
-								<Field.Label>Type</Field.Label>
-								<FormSelect
-									name="primaryAddressType"
-									bind:value={$createData.primaryAddressType}
-									options={[
-										{ value: 'primary', label: 'Primary' },
-										{ value: 'invoicing', label: 'Invoicing' },
-										{ value: 'contract', label: 'Contract' }
-									]}
-									triggerProps={props}
-								/>
-							{/snippet}
-						</Control>
-						<Field.Error><FieldErrors /></Field.Error>
-					</Field.Field>
-				</FormField>
 				<FormField form={createForm} name="primaryAddressLine1">
 					<Field.Field>
 						<Control id="create-primary-address-line-1">
 							{#snippet children({ props })}
 								<Field.Label>Address line 1</Field.Label>
-								<Input {...props} type="text" bind:value={$createData.primaryAddressLine1} />
+								<Input
+									{...props}
+									type="text"
+									required
+									bind:value={$createData.primaryAddressLine1}
+								/>
 							{/snippet}
 						</Control>
 						<Field.Error><FieldErrors /></Field.Error>
@@ -238,7 +211,12 @@
 							<Control id="create-primary-address-city">
 								{#snippet children({ props })}
 									<Field.Label>City</Field.Label>
-									<Input {...props} type="text" bind:value={$createData.primaryAddressCity} />
+									<Input
+										{...props}
+										type="text"
+										required
+										bind:value={$createData.primaryAddressCity}
+									/>
 								{/snippet}
 							</Control>
 							<Field.Error><FieldErrors /></Field.Error>
@@ -262,7 +240,12 @@
 							<Control id="create-primary-address-postcode">
 								{#snippet children({ props })}
 									<Field.Label>Postcode</Field.Label>
-									<Input {...props} type="text" bind:value={$createData.primaryAddressPostcode} />
+									<Input
+										{...props}
+										type="text"
+										required
+										bind:value={$createData.primaryAddressPostcode}
+									/>
 								{/snippet}
 							</Control>
 							<Field.Error><FieldErrors /></Field.Error>