diff --git a/frontend/src/routes/(app)/settings/qr/(components)/form.svelte b/frontend/src/routes/(app)/settings/qr/(components)/form.svelte
deleted file mode 100644
index 64451df..0000000
--- a/frontend/src/routes/(app)/settings/qr/(components)/form.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-	import * as Form from '$lib/components/ui/form'
-	import { Input } from '$lib/components/ui/input'
-	import { formSchema, type FormSchema } from '../schema'
-	import {
-		type SuperValidated,
-		type Infer,
-		superForm,
-	} from 'sveltekit-superforms'
-	import { zodClient } from 'sveltekit-superforms/adapters'
-	import { toast } from 'svelte-sonner'
-	import DemoQr from './DemoQR.svelte'
-	import { LoaderCircle } from 'lucide-svelte'
-
-	export let data: SuperValidated<Infer<FormSchema>>
-
-	const form = superForm(data, {
-		validators: zodClient(formSchema),
-		invalidateAll: 'force',
-		resetForm: true,
-		onResult: ({ result }) => {
-			if (result.status === 200) {
-				toast.success('QR settings updated')
-			}
-			if (result.status === 400) {
-				toast.error('Error updating QR settings')
-			}
-		},
-	})
-
-	const { form: formData, enhance, submitting } = form
-</script>
-
-<DemoQr
-	background={$formData.qr_background}
-	color={$formData.qr_foreground} />
-
-<form method="POST" use:enhance class="flex flex-col gap-6">
-	<Form.Field {form} name="qr_background" class="flex flex-col gap-2">
-		<Form.Control let:attrs>
-			<Form.Label>Background Color</Form.Label>
-			<Input {...attrs} bind:value={$formData.qr_background} />
-		</Form.Control>
-		<Form.Description>QR Code background color</Form.Description>
-		<Form.FieldErrors />
-	</Form.Field>
-	<Form.Field {form} name="qr_foreground" class="flex flex-col gap-2">
-		<Form.Control let:attrs>
-			<Form.Label>Foreground Color</Form.Label>
-			<Input {...attrs} bind:value={$formData.qr_foreground} />
-		</Form.Control>
-		<Form.Description>QR Code foreground color</Form.Description>
-		<Form.FieldErrors />
-	</Form.Field>
-	<Form.Button class="w-fit">
-		{#if $submitting}
-			<LoaderCircle class="animate-spin" />
-		{/if}
-		Save
-	</Form.Button>
-</form>
diff --git a/frontend/src/routes/(app)/settings/qr/+page.svelte b/frontend/src/routes/(app)/settings/qr/+page.svelte
index a99898c..c8729fe 100644
--- a/frontend/src/routes/(app)/settings/qr/+page.svelte
+++ b/frontend/src/routes/(app)/settings/qr/+page.svelte
@@ -1,9 +1,32 @@
 <script lang="ts">
 	import { Separator } from '$lib/components/ui/separator'
 	import type { PageData } from './$types'
-	import Form from './(components)/form.svelte'
+	import * as Form from '$lib/components/ui/form'
+	import { Input } from '$lib/components/ui/input'
+	import { formSchema } from './schema'
+	import { superForm } from 'sveltekit-superforms'
+	import { zodClient } from 'sveltekit-superforms/adapters'
+	import { toast } from 'svelte-sonner'
+	import DemoQr from './(components)/DemoQR.svelte'
+	import { LoaderCircle } from 'lucide-svelte'
 
 	export let data: PageData
+
+	const form = superForm(data.form, {
+		validators: zodClient(formSchema),
+		invalidateAll: 'force',
+		resetForm: true,
+		onResult: ({ result }) => {
+			if (result.status === 200) {
+				toast.success('QR settings updated')
+			}
+			if (result.status === 400) {
+				toast.error('Error updating QR settings')
+			}
+		},
+	})
+
+	const { form: formData, enhance, submitting } = form
 </script>
 
 <div class="space-y-6">
@@ -15,5 +38,32 @@
 	</div>
 	<Separator />
 
-	<Form data={data.form} />
+	<DemoQr
+		background={$formData.qr_background}
+		color={$formData.qr_foreground} />
+
+	<form method="POST" use:enhance class="flex flex-col gap-6">
+		<Form.Field {form} name="qr_background">
+			<Form.Control let:attrs>
+				<Form.Label>Background Color</Form.Label>
+				<Input {...attrs} bind:value={$formData.qr_background} />
+			</Form.Control>
+			<Form.Description>QR Code background color</Form.Description>
+			<Form.FieldErrors />
+		</Form.Field>
+		<Form.Field {form} name="qr_foreground">
+			<Form.Control let:attrs>
+				<Form.Label>Foreground Color</Form.Label>
+				<Input {...attrs} bind:value={$formData.qr_foreground} />
+			</Form.Control>
+			<Form.Description>QR Code foreground color</Form.Description>
+			<Form.FieldErrors />
+		</Form.Field>
+		<Form.Button class="w-fit">
+			{#if $submitting}
+				<LoaderCircle class="animate-spin" />
+			{/if}
+			Save
+		</Form.Button>
+	</form>
 </div>
diff --git a/frontend/src/routes/(app)/settings/qr/schema.ts b/frontend/src/routes/(app)/settings/qr/schema.ts
index 0ba69bc..c9a0792 100644
--- a/frontend/src/routes/(app)/settings/qr/schema.ts
+++ b/frontend/src/routes/(app)/settings/qr/schema.ts
@@ -10,5 +10,3 @@ export const formSchema = z.object({
 		.min(1, { message: 'Foreground color is required' })
 		.max(7),
 })
-
-export type FormSchema = typeof formSchema