diff --git a/frontend/messages/de.json b/frontend/messages/de.json
index 5417f747..02db039a 100644
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -53,8 +53,9 @@
 	"form_placeholder_archive_location": "z.B. Schrank 3, Mappe B",
 	"form_helper_archive_location": "Wo befindet sich das Originaldokument?",
 	"login_heading": "Anmelden",
-	"login_label_username": "Benutzername",
+	"login_label_email": "E-Mail-Adresse",
 	"login_label_password": "Passwort",
+	"login_error_missing_credentials": "Bitte E-Mail-Adresse und Passwort eingeben.",
 	"login_btn_submit": "Anmelden",
 	"docs_search_placeholder": "Titel, Personen, Tags durchsuchen…",
 	"docs_sort_label": "Sortierung",
@@ -164,7 +165,7 @@
 	"admin_tab_groups": "Gruppen",
 	"admin_tab_tags": "Schlagworte",
 	"admin_section_users": "Benutzerverwaltung",
-	"admin_col_login": "Login",
+	"admin_col_login": "E-Mail",
 	"admin_col_groups": "Gruppen",
 	"admin_col_password": "Passwort",
 	"admin_multiselect_hint": "Strg+Klick für Auswahl",
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index b2e76304..ed9a0eb0 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -53,8 +53,9 @@
 	"form_placeholder_archive_location": "e.g. Cabinet 3, Folder B",
 	"form_helper_archive_location": "Where is the original document stored?",
 	"login_heading": "Sign in",
-	"login_label_username": "Username",
+	"login_label_email": "Email",
 	"login_label_password": "Password",
+	"login_error_missing_credentials": "Please enter your email address and password.",
 	"login_btn_submit": "Sign in",
 	"docs_search_placeholder": "Search title, people, tags…",
 	"docs_sort_label": "Sort",
@@ -164,7 +165,7 @@
 	"admin_tab_groups": "Groups",
 	"admin_tab_tags": "Tags",
 	"admin_section_users": "User management",
-	"admin_col_login": "Login",
+	"admin_col_login": "Email",
 	"admin_col_groups": "Groups",
 	"admin_col_password": "Password",
 	"admin_multiselect_hint": "Ctrl+Click to select",
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
index 96f9efc8..19c68d39 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -53,8 +53,9 @@
 	"form_placeholder_archive_location": "p.ej. Armario 3, Carpeta B",
 	"form_helper_archive_location": "¿Dónde se encuentra el documento original?",
 	"login_heading": "Iniciar sesión",
-	"login_label_username": "Usuario",
+	"login_label_email": "Correo electrónico",
 	"login_label_password": "Contraseña",
+	"login_error_missing_credentials": "Por favor, introduzca su correo electrónico y contraseña.",
 	"login_btn_submit": "Iniciar sesión",
 	"docs_search_placeholder": "Buscar título, personas, etiquetas…",
 	"docs_sort_label": "Ordenar",
@@ -164,7 +165,7 @@
 	"admin_tab_groups": "Grupos",
 	"admin_tab_tags": "Etiquetas",
 	"admin_section_users": "Gestión de usuarios",
-	"admin_col_login": "Login",
+	"admin_col_login": "Correo electrónico",
 	"admin_col_groups": "Grupos",
 	"admin_col_password": "Contraseña",
 	"admin_multiselect_hint": "Ctrl+Clic para seleccionar",
diff --git a/frontend/src/app.d.ts b/frontend/src/app.d.ts
index ca517012..6057acbc 100644
--- a/frontend/src/app.d.ts
+++ b/frontend/src/app.d.ts
@@ -5,11 +5,10 @@ declare global {
 		// Define the User structure matching your Java Entity
 		interface User {
 			id: string;
-			username: string;
 			firstName?: string;
 			lastName?: string;
 			birthDate?: string;
-			email?: string;
+			email: string;
 			contact?: string;
 			groups: {
 				id: string;
diff --git a/frontend/src/lib/errors.ts b/frontend/src/lib/errors.ts
index e9001fbb..81057260 100644
--- a/frontend/src/lib/errors.ts
+++ b/frontend/src/lib/errors.ts
@@ -33,6 +33,7 @@ export type ErrorCode =
 	| 'TAG_NOT_FOUND'
 	| 'TAG_MERGE_SELF'
 	| 'TAG_MERGE_INVALID_TARGET'
+	| 'MISSING_CREDENTIALS'
 	| 'UNAUTHORIZED'
 	| 'FORBIDDEN'
 	| 'VALIDATION_ERROR'
@@ -118,6 +119,8 @@ export function getErrorMessage(code: ErrorCode | string | undefined): string {
 			return m.error_tag_merge_self();
 		case 'TAG_MERGE_INVALID_TARGET':
 			return m.error_tag_merge_invalid_target();
+		case 'MISSING_CREDENTIALS':
+			return m.login_error_missing_credentials();
 		case 'UNAUTHORIZED':
 			return m.error_unauthorized();
 		case 'FORBIDDEN':
diff --git a/frontend/src/lib/generated/api.ts b/frontend/src/lib/generated/api.ts
index 4631e759..ba57d088 100644
--- a/frontend/src/lib/generated/api.ts
+++ b/frontend/src/lib/generated/api.ts
@@ -1253,13 +1253,12 @@ export interface components {
         AppUser: {
             /** Format: uuid */
             id: string;
-            username: string;
             password?: string;
             firstName?: string;
             lastName?: string;
             /** Format: date */
             birthDate?: string;
-            email?: string;
+            email: string;
             contact?: string;
             enabled: boolean;
             notifyOnReply: boolean;
@@ -1406,8 +1405,7 @@ export interface components {
             blockIds?: string[];
         };
         CreateUserRequest: {
-            username?: string;
-            email?: string;
+            email: string;
             initialPassword?: string;
             groupIds?: string[];
             firstName?: string;
diff --git a/frontend/src/routes/admin/users/UsersListPanel.svelte b/frontend/src/routes/admin/users/UsersListPanel.svelte
index a76cc7ab..7049aafe 100644
--- a/frontend/src/routes/admin/users/UsersListPanel.svelte
+++ b/frontend/src/routes/admin/users/UsersListPanel.svelte
@@ -10,7 +10,7 @@ type Group = {
 
 type User = {
 	id: string;
-	username: string;
+	email: string;
 	firstName: string | null;
 	lastName: string | null;
 	groups: Group[];
@@ -41,7 +41,7 @@ const filtered = $derived(
 	searchQuery.trim() === ''
 		? users
 		: users.filter((u) =>
-				[u.username, u.firstName, u.lastName]
+				[u.email, u.firstName, u.lastName]
 					.filter(Boolean)
 					.some((v) => v!.toLowerCase().includes(searchQuery.toLowerCase()))
 			)
@@ -128,7 +128,7 @@ const filtered = $derived(
 							? 'border-primary bg-primary/10 dark:bg-primary/15'
 							: 'border-transparent hover:bg-muted'}"
 					>
-						<div class="text-sm font-bold text-ink">{user.username}</div>
+						<div class="text-sm font-bold text-ink">{user.email}</div>
 						{#if fullName}
 							<div class="mt-0.5 text-xs text-ink-3">{fullName}</div>
 						{/if}
diff --git a/frontend/src/routes/admin/users/[id]/+page.svelte b/frontend/src/routes/admin/users/[id]/+page.svelte
index 161e63ad..9296e057 100644
--- a/frontend/src/routes/admin/users/[id]/+page.svelte
+++ b/frontend/src/routes/admin/users/[id]/+page.svelte
@@ -19,7 +19,7 @@ let deleteFormEl = $state<HTMLFormElement | null>(null);
 
 async function handleDelete() {
 	const confirmed = await confirm({
-		title: m.admin_user_delete_confirm({ username: data.editUser.username }),
+		title: m.admin_user_delete_confirm({ username: data.editUser.email }),
 		destructive: true
 	});
 	if (confirmed) deleteFormEl!.requestSubmit();
@@ -49,7 +49,7 @@ $effect(() => {
 			</svg>
 		</a>
 		<h2 class="flex-1 font-sans text-sm font-bold text-ink">
-			{m.admin_user_edit_heading({ username: data.editUser.username })}
+			{m.admin_user_edit_heading({ username: data.editUser.email })}
 		</h2>
 		<form bind:this={deleteFormEl} method="POST" action="?/delete" use:enhance>
 			<button
diff --git a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
index 73b0c86b..4afb89fa 100644
--- a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
@@ -16,7 +16,6 @@ const groups = [
 
 const makeUser = (overrides = {}) => ({
 	id: 'u1',
-	username: 'max',
 	firstName: 'Max',
 	lastName: 'Mustermann',
 	email: 'max@example.com',
@@ -52,9 +51,11 @@ afterEach(cleanup);
 // ─── Rendering ────────────────────────────────────────────────────────────────
 
 describe('Admin edit user page – rendering', () => {
-	it('renders the heading with username', async () => {
+	it('renders the heading with email', async () => {
 		renderPage({ data: baseData, form: null });
-		await expect.element(page.getByText(/Benutzer bearbeiten: max/i)).toBeInTheDocument();
+		await expect
+			.element(page.getByText(/Benutzer bearbeiten: max@example.com/i))
+			.toBeInTheDocument();
 	});
 
 	it('pre-fills first name from editUser data', async () => {
diff --git a/frontend/src/routes/admin/users/layout.server.spec.ts b/frontend/src/routes/admin/users/layout.server.spec.ts
index 32433eb4..8ddc9c54 100644
--- a/frontend/src/routes/admin/users/layout.server.spec.ts
+++ b/frontend/src/routes/admin/users/layout.server.spec.ts
@@ -16,12 +16,12 @@ beforeEach(() => vi.clearAllMocks());
 describe('admin/users layout load', () => {
 	it('returns the users list', async () => {
 		mockApi([
-			{ id: 'u1', username: 'alice' },
-			{ id: 'u2', username: 'bob' }
+			{ id: 'u1', email: 'alice@example.com' },
+			{ id: 'u2', email: 'bob@example.com' }
 		]);
 		const result = await load({ fetch: vi.fn() as unknown as typeof fetch });
 		expect(result.users).toHaveLength(2);
-		expect(result.users[0].username).toBe('alice');
+		expect(result.users[0].email).toBe('alice@example.com');
 	});
 
 	it('returns an empty array when the API returns nothing', async () => {
diff --git a/frontend/src/routes/admin/users/layout.svelte.spec.ts b/frontend/src/routes/admin/users/layout.svelte.spec.ts
index 84164697..29b6c237 100644
--- a/frontend/src/routes/admin/users/layout.svelte.spec.ts
+++ b/frontend/src/routes/admin/users/layout.svelte.spec.ts
@@ -12,14 +12,14 @@ afterEach(cleanup);
 const users = [
 	{
 		id: 'u1',
-		username: 'reader',
+		email: 'reader@example.com',
 		firstName: 'Lea',
 		lastName: 'Leserin',
 		groups: [{ id: 'g1', name: 'Leser', permissions: ['READ_ALL'] }]
 	},
 	{
 		id: 'u2',
-		username: 'admin',
+		email: 'admin@example.com',
 		firstName: null,
 		lastName: null,
 		groups: [{ id: 'g2', name: 'Admins', permissions: ['ADMIN'] }]
@@ -46,10 +46,10 @@ describe('UsersListPanel — header', () => {
 });
 
 describe('UsersListPanel — user items', () => {
-	it('renders each username', async () => {
+	it('renders each email', async () => {
 		render(UsersListPanel, { users });
-		await expect.element(page.getByRole('link', { name: /reader/i })).toBeInTheDocument();
-		await expect.element(page.getByRole('link', { name: /admin/i })).toBeInTheDocument();
+		await expect.element(page.getByText('reader@example.com')).toBeInTheDocument();
+		await expect.element(page.getByText('admin@example.com')).toBeInTheDocument();
 	});
 
 	it('each user links to /admin/users/[id]', async () => {
diff --git a/frontend/src/routes/admin/users/new/+page.server.ts b/frontend/src/routes/admin/users/new/+page.server.ts
index 17af6aee..ad2c7f61 100644
--- a/frontend/src/routes/admin/users/new/+page.server.ts
+++ b/frontend/src/routes/admin/users/new/+page.server.ts
@@ -24,9 +24,8 @@ export const actions: Actions = {
 		const birthDateRaw = data.get('birthDate') as string;
 		const result = await api.POST('/api/users', {
 			body: {
-				username: data.get('username') as string,
+				email: data.get('email') as string,
 				initialPassword: data.get('password') as string,
-				email: (data.get('email') as string) || undefined,
 				groupIds: data.getAll('groupIds') as string[],
 				firstName: (data.get('firstName') as string) || null,
 				lastName: (data.get('lastName') as string) || null,
diff --git a/frontend/src/routes/admin/users/new/AccountSection.svelte b/frontend/src/routes/admin/users/new/AccountSection.svelte
index f567e7e6..951e8a7b 100644
--- a/frontend/src/routes/admin/users/new/AccountSection.svelte
+++ b/frontend/src/routes/admin/users/new/AccountSection.svelte
@@ -11,9 +11,10 @@ import { m } from '$lib/paraglide/messages.js';
 		{m.admin_col_login()}
 	</span>
 	<input
-		type="text"
-		name="username"
+		type="email"
+		name="email"
 		required
+		autocomplete="email"
 		class="w-full rounded-sm border border-line px-3 py-2 font-serif text-sm focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
 	/>
 </label>
diff --git a/frontend/src/routes/admin/users/new/page.svelte.spec.ts b/frontend/src/routes/admin/users/new/page.svelte.spec.ts
index 6ac42717..73a6a629 100644
--- a/frontend/src/routes/admin/users/new/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/users/new/page.svelte.spec.ts
@@ -22,9 +22,10 @@ describe('Admin new user page – rendering', () => {
 		await expect.element(page.getByText(/Neuen Benutzer anlegen/i)).toBeInTheDocument();
 	});
 
-	it('renders the login input', async () => {
+	it('renders the email input', async () => {
 		render(Page, { data: baseData, form: null });
-		await expect.element(page.getByRole('textbox', { name: /Login/i })).toBeInTheDocument();
+		const input = document.querySelector<HTMLInputElement>('input[name="email"]');
+		expect(input).not.toBeNull();
 	});
 
 	it('renders group checkboxes for each available group', async () => {
diff --git a/frontend/src/routes/layout.svelte.spec.ts b/frontend/src/routes/layout.svelte.spec.ts
index 5729843a..3de2e9a8 100644
--- a/frontend/src/routes/layout.svelte.spec.ts
+++ b/frontend/src/routes/layout.svelte.spec.ts
@@ -16,9 +16,9 @@ const tick = () => new Promise((r) => setTimeout(r, 0));
 const makeData = (overrides = {}) => ({
 	user: {
 		id: '1',
-		username: 'max',
 		firstName: 'Max',
 		lastName: 'Müller',
+		email: 'max@example.com',
 		groups: [],
 		enabled: true,
 		createdAt: ''
@@ -39,7 +39,7 @@ describe('Layout – user avatar button', () => {
 	it('shows fallback icon button when names are not set', async () => {
 		render(Layout, {
 			data: makeData({
-				user: { id: '1', username: 'x', groups: [], enabled: true, createdAt: '' }
+				user: { id: '1', email: 'fallback@example.com', groups: [], enabled: true, createdAt: '' }
 			}),
 			children: emptySnippet
 		});
diff --git a/frontend/src/routes/login/+page.server.ts b/frontend/src/routes/login/+page.server.ts
index fd83ae0e..6acbf003 100644
--- a/frontend/src/routes/login/+page.server.ts
+++ b/frontend/src/routes/login/+page.server.ts
@@ -5,14 +5,14 @@ import { getErrorMessage } from '$lib/errors';
 export const actions = {
 	login: async ({ request, cookies, fetch }) => {
 		const data = await request.formData();
-		const username = data.get('username') as string;
+		const email = data.get('email') as string;
 		const password = data.get('password') as string;
 
-		if (!username || !password) {
-			return fail(400, { error: 'Bitte Benutzername und Passwort eingeben.' });
+		if (!email || !password) {
+			return fail(400, { error: getErrorMessage('MISSING_CREDENTIALS') });
 		}
 
-		const credentials = btoa(`${username}:${password}`);
+		const credentials = btoa(`${email}:${password}`);
 		const authHeader = `Basic ${credentials}`;
 
 		// Raw fetch is intentional here: we need to pass an explicit Authorization
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 6fa8f049..db70c763 100644
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -32,16 +32,16 @@ let { form }: { form?: { error?: string; success?: boolean } } = $props();
 				<form method="POST" action="?/login" class="space-y-5">
 					<div>
 						<label
-							for="username"
+							for="email"
 							class="mb-1.5 block font-sans text-xs font-bold tracking-widest text-ink-2 uppercase"
-							>{m.login_label_username()}</label
+							>{m.login_label_email()}</label
 						>
 						<input
-							type="text"
-							name="username"
-							id="username"
+							type="email"
+							name="email"
+							id="email"
 							required
-							autocomplete="username"
+							autocomplete="email"
 							class="block w-full border border-line px-3 py-2.5 font-serif text-sm text-ink placeholder-ink-3 focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
 						/>
 					</div>
diff --git a/frontend/src/routes/login/page.svelte.spec.ts b/frontend/src/routes/login/page.svelte.spec.ts
index 6cf420a8..64681752 100644
--- a/frontend/src/routes/login/page.svelte.spec.ts
+++ b/frontend/src/routes/login/page.svelte.spec.ts
@@ -21,10 +21,10 @@ describe('Login page – rendering', () => {
 		await expect.element(page.getByRole('button', { name: 'Anmelden' })).toBeInTheDocument();
 	});
 
-	it('renders the username input', async () => {
+	it('renders the email input', async () => {
 		render(LoginPage, {});
 		await tick();
-		const input = document.querySelector<HTMLInputElement>('input[name="username"]');
+		const input = document.querySelector<HTMLInputElement>('input[name="email"]');
 		expect(input).not.toBeNull();
 	});
 
@@ -35,10 +35,10 @@ describe('Login page – rendering', () => {
 		expect(input).not.toBeNull();
 	});
 
-	it('username field is required', async () => {
+	it('email field is required', async () => {
 		render(LoginPage, {});
 		await tick();
-		const input = document.querySelector<HTMLInputElement>('input[name="username"]');
+		const input = document.querySelector<HTMLInputElement>('input[name="email"]');
 		expect(input?.required).toBe(true);
 	});
 
@@ -49,6 +49,13 @@ describe('Login page – rendering', () => {
 		expect(input?.required).toBe(true);
 	});
 
+	it('email field has type="email"', async () => {
+		render(LoginPage, {});
+		await tick();
+		const input = document.querySelector<HTMLInputElement>('input[name="email"]');
+		expect(input?.type).toBe('email');
+	});
+
 	it('password field has type="password"', async () => {
 		render(LoginPage, {});
 		await tick();
diff --git a/frontend/src/routes/users/[id]/+page.svelte b/frontend/src/routes/users/[id]/+page.svelte
index a33b89dc..0716ba6c 100644
--- a/frontend/src/routes/users/[id]/+page.svelte
+++ b/frontend/src/routes/users/[id]/+page.svelte
@@ -6,7 +6,7 @@ let { data } = $props();
 const fullName = $derived.by(() => {
 	const first = data.profileUser.firstName;
 	const last = data.profileUser.lastName;
-	return first || last ? [first, last].filter(Boolean).join(' ') : data.profileUser.username;
+	return first || last ? [first, last].filter(Boolean).join(' ') : data.profileUser.email;
 });
 
 const initials = $derived.by(() => {
@@ -70,12 +70,9 @@ const initials = $derived.by(() => {
 				{/if}
 			</div>
 
-			<!-- Name and username -->
+			<!-- Name -->
 			<div class="mb-5 text-center">
 				<h2 class="font-serif text-xl font-bold text-ink">{fullName}</h2>
-				{#if data.profileUser.firstName || data.profileUser.lastName}
-					<p class="mt-0.5 font-sans text-sm text-ink-3">@{data.profileUser.username}</p>
-				{/if}
 			</div>
 
 			<!-- Field rows -->