diff --git a/frontend/src/lib/components/PersonTypeSelector.svelte b/frontend/src/lib/components/PersonTypeSelector.svelte
index 05efe33f..2ddf58cb 100644
--- a/frontend/src/lib/components/PersonTypeSelector.svelte
+++ b/frontend/src/lib/components/PersonTypeSelector.svelte
@@ -6,7 +6,11 @@ import { m } from '$lib/paraglide/messages.js';
 const TYPES = ['PERSON', 'INSTITUTION', 'GROUP', 'UNKNOWN'] as const;
 type PersonType = (typeof TYPES)[number];
 
-let { value = 'PERSON', name = 'personType' }: { value?: string; name?: string } = $props();
+let {
+	value = 'PERSON',
+	name = 'personType',
+	onchange
+}: { value?: string; name?: string; onchange?: (type: PersonType) => void } = $props();
 
 let selected = $state<PersonType>(
 	untrack(() => (TYPES.includes(value as PersonType) ? (value as PersonType) : 'PERSON'))
@@ -21,6 +25,7 @@ const labels: Record<PersonType, () => string> = {
 
 function select(type: PersonType) {
 	selected = type;
+	onchange?.(type);
 }
 </script>
 
diff --git a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
index 9d88464d..f583f9ec 100644
--- a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
+++ b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
@@ -1,10 +1,16 @@
 <script lang="ts">
+import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
+import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
+
+type PersonType = 'PERSON' | 'INSTITUTION' | 'GROUP' | 'UNKNOWN';
 
 let {
 	person
 }: {
 	person: {
+		personType?: string | null;
+		title?: string | null;
 		firstName?: string | null;
 		lastName: string;
 		alias?: string | null;
@@ -13,25 +19,68 @@ let {
 		notes?: string | null;
 	};
 } = $props();
+
+const TYPES = ['PERSON', 'INSTITUTION', 'GROUP', 'UNKNOWN'] as const;
+let selectedType = $state<PersonType>(
+	untrack(() =>
+		TYPES.includes(person.personType as PersonType) ? (person.personType as PersonType) : 'PERSON'
+	)
+);
+
+const isPerson = $derived(selectedType === 'PERSON');
+const lastNameLabel = $derived(
+	selectedType === 'INSTITUTION' || selectedType === 'GROUP'
+		? m.form_label_name()
+		: m.form_label_last_name()
+);
 </script>
 
 <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-	<div>
-		<label for="firstName" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
-			>{m.form_label_first_name()} *</label
-		>
-		<input
-			id="firstName"
-			name="firstName"
-			type="text"
-			required
-			value={person.firstName}
-			class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+	<div class="md:col-span-2">
+		<p class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase">
+			{m.form_label_person_type()}
+		</p>
+		<PersonTypeSelector
+			value={selectedType}
+			name="personType"
+			onchange={(type: PersonType) => (selectedType = type)}
 		/>
 	</div>
-	<div>
+
+	{#if isPerson}
+		<div>
+			<label for="title" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
+				>{m.form_label_title()}</label
+			>
+			<input
+				id="title"
+				name="title"
+				type="text"
+				maxlength="50"
+				value={person.title ?? ''}
+				class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+			/>
+		</div>
+		<div>
+			<label
+				for="firstName"
+				class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
+				>{m.form_label_first_name()} *</label
+			>
+			<input
+				id="firstName"
+				name="firstName"
+				type="text"
+				required
+				value={person.firstName ?? ''}
+				class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+			/>
+		</div>
+	{/if}
+
+	<div class={!isPerson ? 'md:col-span-2' : ''}>
 		<label for="lastName" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
-			>{m.form_label_last_name()} *</label
+			>{lastNameLabel} *</label
 		>
 		<input
 			id="lastName"
@@ -42,48 +91,56 @@ let {
 			class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
 		/>
 	</div>
-	<div class="md:col-span-2">
-		<label for="alias" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
-			>{m.form_label_alias()}</label
-		>
-		<input
-			id="alias"
-			name="alias"
-			type="text"
-			value={person.alias ?? ''}
-			class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
-		/>
-	</div>
-	<div>
-		<label for="birthYear" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
-			>{m.person_label_birth_year()}</label
-		>
-		<input
-			id="birthYear"
-			name="birthYear"
-			type="number"
-			min="1"
-			max="2100"
-			placeholder={m.person_placeholder_year()}
-			value={person.birthYear ?? ''}
-			class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
-		/>
-	</div>
-	<div>
-		<label for="deathYear" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
-			>{m.person_label_death_year()}</label
-		>
-		<input
-			id="deathYear"
-			name="deathYear"
-			type="number"
-			min="1"
-			max="2100"
-			placeholder={m.person_placeholder_year()}
-			value={person.deathYear ?? ''}
-			class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
-		/>
-	</div>
+
+	{#if isPerson}
+		<div class="md:col-span-2">
+			<label for="alias" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
+				>{m.form_label_alias()}</label
+			>
+			<input
+				id="alias"
+				name="alias"
+				type="text"
+				value={person.alias ?? ''}
+				class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+			/>
+		</div>
+		<div>
+			<label
+				for="birthYear"
+				class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
+				>{m.person_label_birth_year()}</label
+			>
+			<input
+				id="birthYear"
+				name="birthYear"
+				type="number"
+				min="1"
+				max="2100"
+				placeholder={m.person_placeholder_year()}
+				value={person.birthYear ?? ''}
+				class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+			/>
+		</div>
+		<div>
+			<label
+				for="deathYear"
+				class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
+				>{m.person_label_death_year()}</label
+			>
+			<input
+				id="deathYear"
+				name="deathYear"
+				type="number"
+				min="1"
+				max="2100"
+				placeholder={m.person_placeholder_year()}
+				value={person.deathYear ?? ''}
+				class="block w-full rounded border border-line px-3 py-2 font-serif text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
+			/>
+		</div>
+	{/if}
+
 	<div class="md:col-span-2">
 		<label for="notes" class="mb-1 block text-xs font-bold tracking-widest text-ink-3 uppercase"
 			>{m.person_label_notes()}</label