diff --git a/astro.config.mjs b/astro.config.mjs
index dd1975e..d329c51 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -10,7 +10,8 @@ export default defineConfig({
     adapter: node({
         mode: 'standalone',
     }),
-    integrations: [preact(), global()],
+    // eslint-disable-next-line no-undef
+    integrations: [preact({ devtools: process.env.NODE_ENV === 'development' }), global()],
     i18n: {
         defaultLocale: 'en',
         locales: ['en'],
diff --git a/src/components/ComplaintLandingPage/AskAuthority.astro b/src/components/ComplaintLandingPage/AskAuthority.astro
index 95ba8bf..b792a33 100644
--- a/src/components/ComplaintLandingPage/AskAuthority.astro
+++ b/src/components/ComplaintLandingPage/AskAuthority.astro
@@ -4,12 +4,14 @@ import Base from '../../layouts/base.astro';
 import { absUrl } from '../../lib/util';
 import TextRaw from '../TextRaw.astro';
 import { dpas } from '../../lib/dpas';
+import RadioForm from '../RadioForm.astro';
 
 interface Props {
     token: string;
+    complaintAuthority: string | null;
 }
 
-const { token } = Astro.props;
+const { token, complaintAuthority } = Astro.props;
 ---
 
 <Base title={t('complaint-landing-askAuthority', 'heading')}>
@@ -17,18 +19,13 @@ const { token } = Astro.props;
         <TextRaw scope="complaint-landing-askAuthority" id="question" />
     </p>
 
-    <div class="col66 col100-mobile">
-        <div class="radio-group radio-group-vertical radio-group-padded">
-            {
-                Object.values(dpas).map((d) => (
-                    <form class="radio-wrapper" method="POST" action={absUrl(`/p/${token}/complain/askAuthority`)}>
-                        <input type="hidden" name="answer" value={d.slug} />
-                        <button type="submit" class="radio-label">
-                            {d.name}
-                        </button>
-                    </form>
-                ))
-            }
-        </div>
-    </div>
+    <RadioForm
+        actionUrl={absUrl(`/p/${token}/complain/askAuthority/answer`)}
+        options={Object.keys(dpas).reduce((agg: Record<string, string>, key: string) => {
+            agg[key] = dpas[key]!.name;
+            return agg;
+        }, {})}
+        value={complaintAuthority}
+        idPrefix="askAuthority"
+    />
 </Base>
diff --git a/src/components/ComplaintLandingPage/AskComplaintType.astro b/src/components/ComplaintLandingPage/AskComplaintType.astro
index b53a36f..6ded906 100644
--- a/src/components/ComplaintLandingPage/AskComplaintType.astro
+++ b/src/components/ComplaintLandingPage/AskComplaintType.astro
@@ -3,12 +3,14 @@ import { t } from '../../i18n/server';
 import Base from '../../layouts/base.astro';
 import { absUrl } from '../../lib/util';
 import TextRaw from '../TextRaw.astro';
+import RadioForm from '../RadioForm.astro';
 
 interface Props {
     token: string;
+    complaintType: string | null | undefined;
 }
 
-const { token } = Astro.props;
+const { token, complaintType } = Astro.props;
 ---
 
 <Base title={t('complaint-landing-askComplaintType', 'heading')}>
@@ -21,18 +23,16 @@ const { token } = Astro.props;
         <li>{t('complaint-landing-askComplaintType', 'informal-complaint-explanation')}</li>
     </ol>
 
-    <div class="col66 col100-mobile">
-        <div class="radio-group radio-group-vertical radio-group-padded">
-            {
-                (['formal', 'informal'] as const).map((type) => (
-                    <form class="radio-wrapper" method="POST" action={absUrl(`/p/${token}/complain/askComplaintType`)}>
-                        <input type="hidden" name="answer" value={type} />
-                        <button type="submit" class="radio-label">
-                            {t('complaint-landing-askComplaintType', `${type}-complaint-button`)}
-                        </button>
-                    </form>
-                ))
-            }
-        </div>
-    </div>
+    <RadioForm
+        actionUrl={absUrl(`/p/${token}/complain/askComplaintType/answer`)}
+        options={(['formal', 'informal'] as const).reduce(
+            (agg, type) =>
+                Object.assign(agg, {
+                    [type]: t('complaint-landing-askComplaintType', `${type}-complaint-button`),
+                }),
+            {},
+        )}
+        value={complaintType}
+        idPrefix="askComplaintType"
+    />
 </Base>
diff --git a/src/components/ComplaintLandingPage/AskDeveloperAddress.astro b/src/components/ComplaintLandingPage/AskDeveloperAddress.astro
index 952e473..2b46045 100644
--- a/src/components/ComplaintLandingPage/AskDeveloperAddress.astro
+++ b/src/components/ComplaintLandingPage/AskDeveloperAddress.astro
@@ -29,7 +29,7 @@ const { token, developerName, privacyPolicyUrl } = Astro.props;
     </p>
 
     <div class="col66 col100-mobile">
-        <form class="radio-wrapper" method="POST" action={absUrl(`/p/${token}/complain/askDeveloperAddress`)}>
+        <form class="radio-wrapper" method="POST" action={absUrl(`/p/${token}/complain/askDeveloperAddress/answer`)}>
             <div class="form-group">
                 <label for="developerAddress">{t('complaint-landing-askDeveloperAddress', 'address')}</label><br />
                 <textarea
diff --git a/src/components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro b/src/components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro
index abe3055..e69c52f 100644
--- a/src/components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro
+++ b/src/components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro
@@ -3,12 +3,14 @@ import { t } from '../../i18n/server';
 import Base from '../../layouts/base.astro';
 import { absUrl } from '../../lib/util';
 import TextRaw from '../TextRaw.astro';
+import RadioForm from '../RadioForm.astro';
 
 interface Props {
     token: string;
+    deviceHasRegisteredSimCard: boolean | null;
 }
 
-const { token } = Astro.props;
+const { token, deviceHasRegisteredSimCard } = Astro.props;
 ---
 
 <Base title={t('complaint-landing-askDeviceHasRegisteredSimCard', 'heading')}>
@@ -16,21 +18,16 @@ const { token } = Astro.props;
         <TextRaw scope="complaint-landing-askDeviceHasRegisteredSimCard" id="explanation" />
     </p>
 
-    <div class="col66 col100-mobile">
-        <div class="radio-group radio-group-vertical radio-group-padded">
-            {
-                (['yes', 'no'] as const).map((p) => (
-                    <form
-                        class="radio-wrapper"
-                        method="POST"
-                        action={absUrl(`/p/${token}/complain/askDeviceHasRegisteredSimCard`)}>
-                        <input type="hidden" name="answer" value={p} />
-                        <button type="submit" class="radio-label">
-                            {t('complaint-landing-askDeviceHasRegisteredSimCard', p)}
-                        </button>
-                    </form>
-                ))
-            }
-        </div>
-    </div>
+    <RadioForm
+        actionUrl={absUrl(`/p/${token}/complain/askDeviceHasRegisteredSimCard/answer`)}
+        options={(['yes', 'no'] as const).reduce(
+            (agg, p) =>
+                Object.assign(agg, {
+                    [p]: t('common', p),
+                }),
+            {},
+        )}
+        value={deviceHasRegisteredSimCard === null ? null : deviceHasRegisteredSimCard ? 'yes' : 'no'}
+        idPrefix="askDeviceHasRegisteredSimCard"
+    />
 </Base>
diff --git a/src/components/ComplaintLandingPage/AskIsUserOfApp.astro b/src/components/ComplaintLandingPage/AskIsUserOfApp.astro
index 4f65597..39279a3 100644
--- a/src/components/ComplaintLandingPage/AskIsUserOfApp.astro
+++ b/src/components/ComplaintLandingPage/AskIsUserOfApp.astro
@@ -3,12 +3,16 @@ import { t } from '../../i18n/server';
 import Base from '../../layouts/base.astro';
 import { absUrl } from '../../lib/util';
 import TextRaw from '../TextRaw.astro';
+import RadioForm from '../RadioForm.astro';
 
 interface Props {
     token: string;
+    complainantIsUserOfApp: boolean | null;
 }
 
-const { token } = Astro.props;
+const { token, complainantIsUserOfApp } = Astro.props;
+const isChecked = (p: string) =>
+    (complainantIsUserOfApp === true && p === 'yes') || (complainantIsUserOfApp === false && p === 'no');
 ---
 
 <Base title={t('complaint-landing-askIsUserOfApp', 'heading')}>
@@ -16,18 +20,16 @@ const { token } = Astro.props;
         <TextRaw scope="complaint-landing-askIsUserOfApp" id="question" />
     </p>
 
-    <div class="col66 col100-mobile">
-        <div class="radio-group radio-group-vertical radio-group-padded">
-            {
-                (['yes', 'no'] as const).map((p) => (
-                    <form class="radio-wrapper" method="POST" action={absUrl(`/p/${token}/complain/askIsUserOfApp`)}>
-                        <input type="hidden" name="answer" value={p} />
-                        <button type="submit" class="radio-label">
-                            {t('common', p)}
-                        </button>
-                    </form>
-                ))
-            }
-        </div>
-    </div>
+    <RadioForm
+        actionUrl={absUrl(`/p/${token}/complain/askIsUserOfApp/answer`)}
+        options={(['yes', 'no'] as const).reduce(
+            (agg, p) =>
+                Object.assign(agg, {
+                    [p]: t('common', p),
+                }),
+            {},
+        )}
+        value={complainantIsUserOfApp === null ? null : complainantIsUserOfApp ? 'yes' : 'no'}
+        idPrefix="askIsUserOfApp"
+    />
 </Base>
diff --git a/src/components/ComplaintLandingPage/AskLoggedIntoAppStore.astro b/src/components/ComplaintLandingPage/AskLoggedIntoAppStore.astro
index e8afa55..40b8ce5 100644
--- a/src/components/ComplaintLandingPage/AskLoggedIntoAppStore.astro
+++ b/src/components/ComplaintLandingPage/AskLoggedIntoAppStore.astro
@@ -3,13 +3,15 @@ import { t } from '../../i18n/server';
 import Base from '../../layouts/base.astro';
 import { absUrl } from '../../lib/util';
 import TextRaw from '../TextRaw.astro';
+import RadioForm from '../RadioForm.astro';
 
 interface Props {
     token: string;
     platform: 'ios' | 'android';
+    loggedIntoAppStore: boolean | null;
 }
 
-const { token, platform } = Astro.props;
+const { token, platform, loggedIntoAppStore } = Astro.props;
 
 const store = t('common', `store-${platform}`);
 ---
@@ -19,21 +21,16 @@ const store = t('common', `store-${platform}`);
         <TextRaw scope="complaint-landing-askLoggedIntoAppStore" id="explanation" fields={{ store }} />
     </p>
 
-    <div class="col66 col100-mobile">
-        <div class="radio-group radio-group-vertical radio-group-padded">
-            {
-                (['yes', 'no'] as const).map((p) => (
-                    <form
-                        class="radio-wrapper"
-                        method="POST"
-                        action={absUrl(`/p/${token}/complain/askLoggedIntoAppStore`)}>
-                        <input type="hidden" name="answer" value={p} />
-                        <button type="submit" class="radio-label">
-                            {t('complaint-landing-askLoggedIntoAppStore', p, { store })}
-                        </button>
-                    </form>
-                ))
-            }
-        </div>
-    </div>
+    <RadioForm
+        actionUrl={absUrl(`/p/${token}/complain/askLoggedIntoAppStore/answer`)}
+        options={(['yes', 'no'] as const).reduce(
+            (agg, p) =>
+                Object.assign(agg, {
+                    [p]: t('complaint-landing-askLoggedIntoAppStore', p, { store }),
+                }),
+            {},
+        )}
+        value={loggedIntoAppStore === null ? null : loggedIntoAppStore ? 'yes' : 'no'}
+        idPrefix="askLoggedIntoAppStore"
+    />
 </Base>
diff --git a/src/components/ComplaintLandingPage/AskUserNetworkActivity.astro b/src/components/ComplaintLandingPage/AskUserNetworkActivity.astro
index 53c0b1b..0596770 100644
--- a/src/components/ComplaintLandingPage/AskUserNetworkActivity.astro
+++ b/src/components/ComplaintLandingPage/AskUserNetworkActivity.astro
@@ -17,7 +17,10 @@ const { token, platform } = Astro.props;
         <TextRaw scope="complaint-landing-askUserNetworkActivity" id={`explanation-${platform}`} />
     </p>
 
-    <form action={absUrl(`/p/${token}/complain/askUserNetworkActivity`)} enctype="multipart/form-data" method="post">
+    <form
+        action={absUrl(`/p/${token}/complain/askUserNetworkActivity/answer`)}
+        enctype="multipart/form-data"
+        method="post">
         <label for="upload" class="sr-only">{t('complaint-landing-askUserNetworkActivity', 'choose-file')}</label>
         <input type="file" id="upload" name="upload" accept={platform === 'android' ? '.csv' : '.ndjson'} required />
         <button class="button button-primary button-small" type="submit">
diff --git a/src/components/RadioForm.astro b/src/components/RadioForm.astro
new file mode 100644
index 0000000..69ad462
--- /dev/null
+++ b/src/components/RadioForm.astro
@@ -0,0 +1,53 @@
+---
+import { t } from '../i18n/server';
+
+interface Props {
+    actionUrl: string;
+    idPrefix: string;
+    options: Record<string, string>;
+    value: string | null | undefined;
+}
+
+const { idPrefix, actionUrl, options, value } = Astro.props;
+---
+
+<div class="col66 col100-mobile">
+    <div class="radio-group radio-group-vertical radio-group-padded">
+        <form method="POST" id={`${idPrefix}-form`} action={actionUrl} class="astro-radio-form">
+            {
+                Object.keys(options).map((option) => (
+                    <div class="radio-wrapper">
+                        <input
+                            id={`${idPrefix}-radio-${option}`}
+                            type="radio"
+                            name="answer"
+                            class="form-element"
+                            value={option}
+                            checked={option === value}
+                            required="true"
+                        />
+                        <label class={`radio-label `} for={`${idPrefix}-radio-${option}`}>
+                            {options[option]}
+                        </label>
+                    </div>
+                ))
+            }
+            <button type="submit" class="button sr-only">{t('common', 'continue')}</button>
+        </form>
+    </div>
+</div>
+
+<script>
+    const forms = document.getElementsByClassName('astro-radio-form') as HTMLCollectionOf<HTMLFormElement>;
+
+    for (const form of forms) {
+        const inputs = form.querySelectorAll('div.radio-wrapper');
+
+        // The "click" event is also triggered by chnage events for radio buttons (https://www.w3.org/TR/2012/WD-html5-20121025/content-models.html#interactive-content)
+        // Because of that, we use `mouseup` here, to specifically only check for actual clicks
+        for (const input of inputs)
+            input.addEventListener('mouseup', (e) => {
+                if ((e as MouseEvent).button === 0) form.submit();
+            });
+    }
+</script>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8a8161b..b98ed67 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -6,7 +6,8 @@
         "store-ios": "Apple App Store",
         "yes": "Yes",
         "no": "No",
-        "submit": "Submit"
+        "submit": "Submit",
+        "continue": "Continue"
     },
     "base": {
         "skip-to-content": "Skip to content",
diff --git a/src/pages/p/[platform]/[appId]/index.ts b/src/pages/p/[platform]/[appId]/index.ts
index 3d84236..d57b04b 100644
--- a/src/pages/p/[platform]/[appId]/index.ts
+++ b/src/pages/p/[platform]/[appId]/index.ts
@@ -19,7 +19,13 @@ export const POST: APIRoute = async ({ params, redirect, currentLocale, clientAd
 
     const token = nanoid();
 
-    const appMeta = await getAppMeta({ platform, appId, language: currentLocale || 'en' });
+    let appMeta;
+    try {
+        appMeta = await getAppMeta({ platform, appId, language: currentLocale || 'en' });
+    } catch (e) {
+        // TODO: Proper error handling
+        return new Response('Getting the apps’s metadata failed.', { status: 500 });
+    }
     if (!appMeta) return new Response('App not found.', { status: 404 });
 
     const { token: analysisToken } = await startAnalysis(platform, appMeta.appId);
diff --git a/src/pages/p/[token]/complain/[question].ts b/src/pages/p/[token]/complain/[question].ts
deleted file mode 100644
index 85fd11b..0000000
--- a/src/pages/p/[token]/complain/[question].ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import type { APIRoute } from 'astro';
-import { parseNetworkActivityReport } from 'reporthar';
-import { z } from 'zod';
-import { zfd } from 'zod-form-data';
-import type { UpdateShape } from '../../../../../dbschema/edgeql-js/update';
-import { client, e } from '../../../../lib/db';
-import { dpas } from '../../../../lib/dpas';
-
-const complaintQuestionSchema = z.object({
-    token: z.string(),
-    question: z.enum([
-        'askIsUserOfApp',
-        'askAuthority',
-        'askComplaintType',
-        'askUserNetworkActivity',
-        'askLoggedIntoAppStore',
-        'askDeviceHasRegisteredSimCard',
-        'askDeveloperAddress',
-    ]),
-});
-
-export const POST: APIRoute = async ({ params, request, redirect }) => {
-    const { token, question } = complaintQuestionSchema.parse(params);
-
-    const proceeding = await e
-        .select(e.Proceeding, () => ({
-            state: true,
-            complaintState: true,
-
-            app: {
-                appId: true,
-                platform: true,
-            },
-
-            // eslint-disable-next-line camelcase
-            filter_single: { token },
-        }))
-        .assert_single()
-        .run(client);
-    if (!proceeding) return new Response('Invalid token.', { status: 403 });
-
-    if (proceeding.state !== 'awaitingComplaint') return new Response('You answer this question now.', { status: 400 });
-
-    const set: UpdateShape<typeof e.Proceeding> = {};
-
-    if (question === 'askIsUserOfApp') {
-        const { answer } = zfd
-            .formData({
-                answer: zfd.text(z.enum(['yes', 'no'])),
-            })
-            .parse(await request.formData());
-
-        set.complainantIsUserOfApp = answer === 'yes';
-        if (answer === 'no') set.complaintType = 'informal';
-    } else if (question === 'askAuthority') {
-        const { answer } = zfd
-            .formData({
-                answer: zfd.text(z.enum(Object.keys(dpas) as [string])),
-            })
-            .parse(await request.formData());
-
-        set.complaintAuthority = answer;
-    } else if (question === 'askComplaintType') {
-        const { answer } = zfd
-            .formData({
-                answer: zfd.text(z.enum(['formal', 'informal'])),
-            })
-            .parse(await request.formData());
-
-        set.complaintType = answer;
-    } else if (question === 'askUserNetworkActivity') {
-        const { upload } = zfd
-            .formData({
-                upload: zfd.file(),
-            })
-            .parse(await request.formData());
-
-        set.userNetworkActivityRaw = new Uint8Array(await upload.arrayBuffer());
-        set.userNetworkActivity = parseNetworkActivityReport(
-            proceeding.app.platform === 'android' ? 'tracker-control-csv' : 'ios-app-privacy-report-ndjson',
-            await upload.text(),
-        ).filter(
-            (e) =>
-                // The `appId` is always `undefined` in the case of single app exports but we do also want to support full
-                // exports across all apps.
-                e.appId === undefined || e.appId === proceeding.app.appId,
-        );
-    } else if (question === 'askLoggedIntoAppStore') {
-        const { answer } = zfd
-            .formData({
-                answer: zfd.text(z.enum(['yes', 'no'])),
-            })
-            .parse(await request.formData());
-
-        set.loggedIntoAppStore = answer === 'yes';
-    } else if (question === 'askDeviceHasRegisteredSimCard') {
-        const { answer } = zfd
-            .formData({
-                answer: zfd.text(z.enum(['yes', 'no'])),
-            })
-            .parse(await request.formData());
-
-        set.deviceHasRegisteredSimCard = answer === 'yes';
-    } else if (question === 'askDeveloperAddress') {
-        const { developerAddress, developerAddressSourceUrl } = zfd
-            .formData({
-                developerAddress: zfd.text(),
-                developerAddressSourceUrl: zfd.text(),
-            })
-            .parse(await request.formData());
-
-        set.developerAddress = developerAddress;
-        set.developerAddressSourceUrl = developerAddressSourceUrl;
-    }
-
-    await e
-        .update(e.Proceeding, () => ({
-            // eslint-disable-next-line camelcase
-            filter_single: { token },
-
-            set,
-        }))
-        .run(client);
-
-    return redirect(`/p/${token}/complain`);
-};
diff --git a/src/pages/p/[token]/complain/[question]/answer.ts b/src/pages/p/[token]/complain/[question]/answer.ts
new file mode 100644
index 0000000..a26efb4
--- /dev/null
+++ b/src/pages/p/[token]/complain/[question]/answer.ts
@@ -0,0 +1,136 @@
+import type { APIRoute } from 'astro';
+import { parseNetworkActivityReport } from 'reporthar';
+import { z } from 'zod';
+import { zfd } from 'zod-form-data';
+import type { UpdateShape } from '../../../../../../dbschema/edgeql-js/update';
+import { client, e } from '../../../../../lib/db';
+import { dpas } from '../../../../../lib/dpas';
+
+const complaintQuestionSchema = z.object({
+    token: z.string(),
+    question: z.enum([
+        'askIsUserOfApp',
+        'askAuthority',
+        'askComplaintType',
+        'askUserNetworkActivity',
+        'askLoggedIntoAppStore',
+        'askDeviceHasRegisteredSimCard',
+        'askDeveloperAddress',
+    ]),
+});
+
+export const POST: APIRoute = async ({ params, request, redirect }) => {
+    const { token, question } = complaintQuestionSchema.parse(params);
+
+    const proceeding = await e
+        .select(e.Proceeding, () => ({
+            state: true,
+            complaintState: true,
+
+            app: {
+                appId: true,
+                platform: true,
+            },
+
+            // eslint-disable-next-line camelcase
+            filter_single: { token },
+        }))
+        .assert_single()
+        .run(client);
+    if (!proceeding) return new Response('Invalid token.', { status: 403 });
+
+    if (proceeding.state !== 'awaitingComplaint') return new Response('You answer this question now.', { status: 400 });
+
+    try {
+        const set: UpdateShape<typeof e.Proceeding> = {};
+
+        if (question === 'askIsUserOfApp') {
+            const { answer } = zfd
+                .formData({
+                    answer: zfd.text(z.enum(['yes', 'no'])),
+                })
+                .parse(await request.formData());
+
+            set.complainantIsUserOfApp = answer === 'yes';
+            if (answer === 'no') set.complaintType = 'informal';
+            else set.complaintType = null; // This overwrites the old value, if there is one.
+        } else if (question === 'askAuthority') {
+            const { answer } = zfd
+                .formData({
+                    answer: zfd.text(z.enum(Object.keys(dpas) as [string])),
+                })
+                .parse(await request.formData());
+
+            set.complaintAuthority = answer;
+        } else if (question === 'askComplaintType') {
+            const { answer } = zfd
+                .formData({
+                    answer: zfd.text(z.enum(['formal', 'informal'])),
+                })
+                .parse(await request.formData());
+
+            set.complaintType = answer;
+        } else if (question === 'askUserNetworkActivity') {
+            const { upload } = zfd
+                .formData({
+                    upload: zfd.file(),
+                })
+                .parse(await request.formData());
+
+            set.userNetworkActivityRaw = new Uint8Array(await upload.arrayBuffer());
+            set.userNetworkActivity = parseNetworkActivityReport(
+                proceeding.app.platform === 'android' ? 'tracker-control-csv' : 'ios-app-privacy-report-ndjson',
+                await upload.text(),
+            ).filter(
+                (e) =>
+                    // The `appId` is always `undefined` in the case of single app exports but we do also want to support full
+                    // exports across all apps.
+                    e.appId === undefined || e.appId === proceeding.app.appId,
+            );
+        } else if (question === 'askLoggedIntoAppStore') {
+            const { answer } = zfd
+                .formData({
+                    answer: zfd.text(z.enum(['yes', 'no'])),
+                })
+                .parse(await request.formData());
+
+            set.loggedIntoAppStore = answer === 'yes';
+        } else if (question === 'askDeviceHasRegisteredSimCard') {
+            const { answer } = zfd
+                .formData({
+                    answer: zfd.text(z.enum(['yes', 'no'])),
+                })
+                .parse(await request.formData());
+
+            set.deviceHasRegisteredSimCard = answer === 'yes';
+        } else if (question === 'askDeveloperAddress') {
+            const { developerAddress, developerAddressSourceUrl } = zfd
+                .formData({
+                    developerAddress: zfd.text(),
+                    developerAddressSourceUrl: zfd.text(),
+                })
+                .parse(await request.formData());
+
+            set.developerAddress = developerAddress;
+            set.developerAddressSourceUrl = developerAddressSourceUrl;
+        }
+
+        const updated = await e.update(e.Proceeding, () => ({
+            // eslint-disable-next-line camelcase
+            filter_single: { token },
+            set,
+        }));
+        const updatedProceeding = await e
+            .select(updated, (proceeding) => ({
+                complaintState: true,
+            }))
+            .run(client);
+
+        return redirect(`/p/${token}/complain/${updatedProceeding?.complaintState || ''}`);
+    } catch (error) {
+        if (error instanceof z.ZodError) {
+            return new Response('Zod validation of your request failed.', { status: 401 });
+        }
+        return new Response('Unhandled internal error', { status: 500 });
+    }
+};
diff --git a/src/pages/p/[token]/complain/[question]/index.astro b/src/pages/p/[token]/complain/[question]/index.astro
new file mode 100644
index 0000000..2ef0bf3
--- /dev/null
+++ b/src/pages/p/[token]/complain/[question]/index.astro
@@ -0,0 +1,88 @@
+---
+import { e, client } from '../../../../../lib/db';
+import { z } from 'zod';
+import { isValidComplaintState } from '../../../../../lib/typeguard';
+import AskIsUserOfApp from '../../../../../components/ComplaintLandingPage/AskIsUserOfApp.astro';
+import AskAuthority from '../../../../../components/ComplaintLandingPage/AskAuthority.astro';
+import AskComplaintType from '../../../../../components/ComplaintLandingPage/AskComplaintType.astro';
+import AskUserNetworkActivity from '../../../../../components/ComplaintLandingPage/AskUserNetworkActivity.astro';
+import AskLoggedIntoAppStore from '../../../../../components/ComplaintLandingPage/AskLoggedIntoAppStore.astro';
+import AskDeviceHasRegisteredSimCard from '../../../../../components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro';
+import AskDeveloperAddress from '../../../../../components/ComplaintLandingPage/AskDeveloperAddress.astro';
+import ReadyToSend from '../../../../../components/ComplaintLandingPage/ReadyToSend.astro';
+
+const complaintQuestionSchema = z.object({
+    token: z.string(),
+    question: z.enum([
+        'askIsUserOfApp',
+        'askAuthority',
+        'askComplaintType',
+        'askUserNetworkActivity',
+        'askLoggedIntoAppStore',
+        'askDeviceHasRegisteredSimCard',
+        'askDeveloperAddress',
+        'readyToSend',
+    ]),
+});
+
+const { token, question } = complaintQuestionSchema.parse(Astro.params);
+
+const proceeding = await e
+    .select(e.Proceeding, () => ({
+        app: {
+            platform: true,
+        },
+        developerName: true,
+        privacyPolicyUrl: true,
+        complaintAuthority: true,
+
+        state: true,
+        complaintState: true,
+        complainantIsUserOfApp: true,
+        complaintType: true,
+        loggedIntoAppStore: true,
+        deviceHasRegisteredSimCard: true,
+
+        filter_single: { token },
+    }))
+    .assert_single()
+    .run(client);
+
+if (!proceeding) return new Response('Invalid token.', { status: 403 });
+if (proceeding.state !== 'awaitingComplaint') return new Response('You cannot send a complaint now.', { status: 400 });
+
+const state = proceeding.complaintState;
+if (!state || !isValidComplaintState(state)) throw new Error('This should never happen.');
+
+const {
+    developerName,
+    privacyPolicyUrl,
+    complaintAuthority,
+    complainantIsUserOfApp,
+    complaintType,
+    loggedIntoAppStore,
+    deviceHasRegisteredSimCard,
+} = proceeding;
+---
+
+{
+    question === 'askIsUserOfApp' ? (
+        <AskIsUserOfApp {token} {complainantIsUserOfApp} />
+    ) : question === 'askAuthority' ? (
+        <AskAuthority {token} {complaintAuthority} />
+    ) : question === 'askComplaintType' ? (
+        <AskComplaintType {token} {complaintType} />
+    ) : question === 'askUserNetworkActivity' ? (
+        <AskUserNetworkActivity {token} platform={proceeding.app.platform} />
+    ) : question === 'askLoggedIntoAppStore' ? (
+        <AskLoggedIntoAppStore {token} platform={proceeding.app.platform} {loggedIntoAppStore} />
+    ) : question === 'askDeviceHasRegisteredSimCard' ? (
+        <AskDeviceHasRegisteredSimCard {token} {deviceHasRegisteredSimCard} />
+    ) : question === 'askDeveloperAddress' ? (
+        <AskDeveloperAddress {token} developerName={proceeding.developerName} {privacyPolicyUrl} />
+    ) : question === 'readyToSend' && state === 'readyToSend' ? (
+        <ReadyToSend {token} platform={proceeding.app.platform} {complaintAuthority} />
+    ) : (
+        ''
+    )
+}
diff --git a/src/pages/p/[token]/complain/index.astro b/src/pages/p/[token]/complain/index.astro
index ba35fd6..d7ff8d8 100644
--- a/src/pages/p/[token]/complain/index.astro
+++ b/src/pages/p/[token]/complain/index.astro
@@ -1,27 +1,12 @@
 ---
 import { e, client } from '../../../../lib/db';
 import { isValidComplaintState } from '../../../../lib/typeguard';
-import AskIsUserOfApp from '../../../../components/ComplaintLandingPage/AskIsUserOfApp.astro';
-import AskAuthority from '../../../../components/ComplaintLandingPage/AskAuthority.astro';
-import AskComplaintType from '../../../../components/ComplaintLandingPage/AskComplaintType.astro';
-import AskUserNetworkActivity from '../../../../components/ComplaintLandingPage/AskUserNetworkActivity.astro';
-import AskLoggedIntoAppStore from '../../../../components/ComplaintLandingPage/AskLoggedIntoAppStore.astro';
-import AskDeviceHasRegisteredSimCard from '../../../../components/ComplaintLandingPage/AskDeviceHasRegisteredSimCard.astro';
-import AskDeveloperAddress from '../../../../components/ComplaintLandingPage/AskDeveloperAddress.astro';
-import ReadyToSend from '../../../../components/ComplaintLandingPage/ReadyToSend.astro';
 
 const { token } = Astro.params;
 if (!token) throw new Error('This should never happen.');
 
 const proceeding = await e
     .select(e.Proceeding, () => ({
-        app: {
-            platform: true,
-        },
-        developerName: true,
-        privacyPolicyUrl: true,
-        complaintAuthority: true,
-
         state: true,
         complaintState: true,
 
@@ -36,27 +21,5 @@ if (proceeding.state !== 'awaitingComplaint') return new Response('You cannot se
 const state = proceeding.complaintState;
 if (!state || !isValidComplaintState(state)) throw new Error('This should never happen.');
 
-const { developerName, privacyPolicyUrl, complaintAuthority } = proceeding;
+return Astro.redirect(`/p/${token}/complain/${state}`);
 ---
-
-{
-    state === 'askIsUserOfApp' ? (
-        <AskIsUserOfApp {token} />
-    ) : state === 'askAuthority' ? (
-        <AskAuthority {token} />
-    ) : state === 'askComplaintType' ? (
-        <AskComplaintType {token} />
-    ) : state === 'askUserNetworkActivity' ? (
-        <AskUserNetworkActivity {token} platform={proceeding.app.platform} />
-    ) : state === 'askLoggedIntoAppStore' ? (
-        <AskLoggedIntoAppStore {token} platform={proceeding.app.platform} />
-    ) : state === 'askDeviceHasRegisteredSimCard' ? (
-        <AskDeviceHasRegisteredSimCard {token} />
-    ) : state === 'askDeveloperAddress' ? (
-        <AskDeveloperAddress {token} {developerName} {privacyPolicyUrl} />
-    ) : state === 'readyToSend' ? (
-        <ReadyToSend {token} platform={proceeding.app.platform} {complaintAuthority} />
-    ) : (
-        ''
-    )
-}
diff --git a/src/pages/p/[token]/evaluate-response/[response].ts b/src/pages/p/[token]/evaluate-response/[response].ts
index 5510ccb..d4272cf 100644
--- a/src/pages/p/[token]/evaluate-response/[response].ts
+++ b/src/pages/p/[token]/evaluate-response/[response].ts
@@ -29,29 +29,47 @@ export const POST: APIRoute = async ({ params, redirect }) => {
         .run(client);
     if (!proceeding) return new Response('Invalid token.', { status: 403 });
 
-    if (!['awaitingControllerResponse'].includes(proceeding.state) || !proceeding.noticeSent)
-        return new Response('You cannot evaluate the response to this proceeding now.', { status: 400 });
+    if (!proceeding.noticeSent)
+        return new Response('You cannot evaluate the response to this proceeding now.', { status: 400 }); // Arguably, we might fail more gracefully if we redirect to /p/ here
 
-    if (response === 'none' && new Date() < calculateDeadline(proceeding.noticeSent))
-        return new Response('Give the developer until the end of the deadline to respond.', { status: 400 });
+    if (proceeding.state === 'awaitingControllerResponse') {
+        if (response === 'none' && new Date() < calculateDeadline(proceeding.noticeSent))
+            return new Response('Give the developer until the end of the deadline to respond.', { status: 400 });
 
-    const { token: analysisToken } = await startAnalysis(proceeding.app.platform, proceeding.app.appId);
+        const { token: analysisToken } = await startAnalysis(proceeding.app.platform, proceeding.app.appId);
 
-    await e
-        .update(e.Proceeding, () => ({
-            // eslint-disable-next-line camelcase
-            filter_single: { token },
+        // TODO: Fail if starting analysis fails
 
-            set: {
-                controllerResponse: response,
+        await e
+            .update(e.Proceeding, () => ({
+                // eslint-disable-next-line camelcase
+                filter_single: { token },
 
-                requestedAnalysis: e.insert(e.RequestedAnalysis, {
-                    type: 'second',
-                    token: analysisToken,
-                }),
-            },
-        }))
-        .run(client);
+                set: {
+                    controllerResponse: response,
+
+                    requestedAnalysis: e.insert(e.RequestedAnalysis, {
+                        type: 'second',
+                        token: analysisToken,
+                    }),
+                },
+            }))
+            .run(client);
+    } else if (proceeding.state === 'needsSecondAnalysis') {
+        if (response === 'none' && new Date() < calculateDeadline(proceeding.noticeSent))
+            return new Response('Give the developer until the end of the deadline to respond.', { status: 400 });
+
+        await e
+            .update(e.Proceeding, () => ({
+                // eslint-disable-next-line camelcase
+                filter_single: { token },
+
+                set: {
+                    controllerResponse: response,
+                },
+            }))
+            .run(client);
+    } else return new Response('You cannot evaluate the response to this proceeding now.', { status: 400 }); // Arguably, we might fails more gracefully if we redirect to /p/ here
 
     return redirect(`/p/${token}`);
 };
diff --git a/src/pages/p/[token]/evaluate-response/index.astro b/src/pages/p/[token]/evaluate-response/index.astro
index 238241a..57785bb 100644
--- a/src/pages/p/[token]/evaluate-response/index.astro
+++ b/src/pages/p/[token]/evaluate-response/index.astro
@@ -19,7 +19,7 @@ const proceeding = await e
     .assert_single()
     .run(client);
 
-if (proceeding?.state !== 'awaitingControllerResponse' || !proceeding.noticeSent)
+if (!proceeding?.noticeSent || !['awaitingControllerResponse', 'needsSecondAnalysis'].includes(proceeding.state))
     return new Response('You cannot evaluate the response to this proceeding now.', { status: 400 });
 
 const deadline = calculateDeadline(proceeding.noticeSent);
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 1b30e7c..faf77d0 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -43,3 +43,35 @@ hr {
         }
     }
 }
+
+%sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border: 0;
+}
+
+.radio-wrapper {
+    &:hover,
+    &:focus,
+    &:focus-within {
+        & > .radio-label {
+            background-color: #192a4a !important;
+            color: #f7fafc;
+        }
+    }
+
+    input[type='radio'].form-element {
+        appearance: none;
+        @extend %sr-only;
+    }
+
+    input[type='radio']:checked + .radio-label {
+        background-color: #214192;
+        color: #f7fafc;
+    }
+}