diff --git a/frontend/src/pages/AdministrationPage.tsx b/frontend/src/pages/AdministrationPage.tsx
index cf9fce2..9631994 100644
--- a/frontend/src/pages/AdministrationPage.tsx
+++ b/frontend/src/pages/AdministrationPage.tsx
@@ -1,9 +1,10 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState, type KeyboardEvent as ReactKeyboardEvent } from "react";
 import { useLocation } from "react-router-dom";
 import { apiGet, apiPost } from "../lib/api";
 import type { AdministrationOverview, MedicationCategory, PathogenKind } from "../lib/types";
 
 type DatasetKey = "farmers" | "medications" | "pathogens" | "antibiotics";
+type CatalogDatasetKey = Exclude<DatasetKey, "farmers">;
 
 type EditableRow = {
   id: string;
@@ -74,6 +75,373 @@ function isFarmerRowIncomplete(row: EditableRow) {
   });
 }
 
+function mapFarmerMutation(row: EditableRow) {
+  return {
+    id: row.id || null,
+    customerNumber: row.customerNumber || null,
+    companyName: row.companyName,
+    contactPerson: row.contactPerson || null,
+    street: row.street || null,
+    houseNumber: row.houseNumber || null,
+    postalCode: row.postalCode || null,
+    city: row.city || null,
+    email: row.email || null,
+    phoneNumber: row.phoneNumber || null,
+    active: row.active,
+  };
+}
+
+function medicationCategoryLabel(category: MedicationCategory | undefined) {
+  switch (category) {
+    case "IN_UDDER":
+      return "ins Euter";
+    case "SYSTEMIC_ANTIBIOTIC":
+      return "systemisch Antibiotika";
+    case "SYSTEMIC_PAIN":
+      return "systemisch Schmerzmittel";
+    case "DRY_SEALER":
+      return "Versiegler";
+    case "DRY_ANTIBIOTIC":
+      return "Trockenstellerprobe Antibiotika";
+    default:
+      return "-";
+  }
+}
+
+function pathogenKindLabel(kind: PathogenKind | undefined) {
+  switch (kind) {
+    case "BACTERIAL":
+      return "bakteriell";
+    case "NO_GROWTH":
+      return "kein Wachstum";
+    case "CONTAMINATED":
+      return "verunreinigt";
+    case "OTHER":
+      return "sonstiges";
+    default:
+      return "-";
+  }
+}
+
+function catalogDialogTitle(dataset: CatalogDatasetKey) {
+  switch (dataset) {
+    case "medications":
+      return "Medikament bearbeiten";
+    case "pathogens":
+      return "Erreger bearbeiten";
+    case "antibiotics":
+      return "Antibiogramm bearbeiten";
+  }
+}
+
+function catalogEmptyMessage(dataset: CatalogDatasetKey) {
+  switch (dataset) {
+    case "medications":
+      return "Noch keine Medikamente vorhanden.";
+    case "pathogens":
+      return "Noch keine Erreger vorhanden.";
+    case "antibiotics":
+      return "Noch keine Antibiogramm-Eintraege vorhanden.";
+  }
+}
+
+function isCatalogFieldInvalid(
+  dataset: CatalogDatasetKey,
+  row: EditableRow,
+  field: keyof EditableRow,
+  showValidation: boolean,
+) {
+  if (!showValidation) {
+    return false;
+  }
+
+  switch (field) {
+    case "name":
+      return isBlankValue(row.name);
+    case "category":
+      return dataset === "medications" && !row.category;
+    case "kind":
+      return dataset === "pathogens" && !row.kind;
+    default:
+      return false;
+  }
+}
+
+function isCatalogRowIncomplete(dataset: CatalogDatasetKey, row: EditableRow) {
+  if (isBlankValue(row.name)) {
+    return true;
+  }
+  if (dataset === "medications") {
+    return !row.category;
+  }
+  if (dataset === "pathogens") {
+    return !row.kind;
+  }
+  return false;
+}
+
+function CatalogForm({
+  dataset,
+  row,
+  onChange,
+  showValidation,
+}: {
+  dataset: CatalogDatasetKey;
+  row: EditableRow;
+  onChange: (patch: Partial<EditableRow>) => void;
+  showValidation: boolean;
+}) {
+  return (
+    <article className="admin-catalog-form">
+      {dataset === "medications" ? (
+        <div className="field-grid">
+          <label className="field field--required field--wide">
+            <span>Name</span>
+            <input
+              className={isCatalogFieldInvalid(dataset, row, "name", showValidation) ? "is-invalid" : ""}
+              value={row.name ?? ""}
+              onChange={(event) => onChange({ name: event.target.value })}
+              placeholder="Name"
+              required
+            />
+          </label>
+          <label className="field field--required">
+            <span>Kategorie</span>
+            <select
+              className={isCatalogFieldInvalid(dataset, row, "category", showValidation) ? "is-invalid" : ""}
+              value={row.category ?? "IN_UDDER"}
+              onChange={(event) => onChange({ category: event.target.value as MedicationCategory })}
+              required
+            >
+              <option value="IN_UDDER">ins Euter</option>
+              <option value="SYSTEMIC_ANTIBIOTIC">systemisch Antibiotika</option>
+              <option value="SYSTEMIC_PAIN">systemisch Schmerzmittel</option>
+              <option value="DRY_SEALER">Versiegler</option>
+              <option value="DRY_ANTIBIOTIC">Trockenstellerprobe Antibiotika</option>
+            </select>
+          </label>
+          <label className="field">
+            <span>Aktiv</span>
+            <button
+              type="button"
+              className={`eye-button admin-catalog-form__toggle ${row.active ? "is-active" : "is-inactive"}`}
+              onClick={() => onChange({ active: !row.active })}
+            >
+              {row.active ? "sichtbar" : "inaktiv"}
+            </button>
+          </label>
+        </div>
+      ) : null}
+
+      {dataset === "pathogens" ? (
+        <div className="field-grid">
+          <label className="field field--required field--wide">
+            <span>Name</span>
+            <input
+              className={isCatalogFieldInvalid(dataset, row, "name", showValidation) ? "is-invalid" : ""}
+              value={row.name ?? ""}
+              onChange={(event) => onChange({ name: event.target.value })}
+              placeholder="Name"
+              required
+            />
+          </label>
+          <label className="field">
+            <span>Kuerzel</span>
+            <input
+              value={row.code ?? ""}
+              onChange={(event) => onChange({ code: event.target.value })}
+              placeholder="Kuerzel"
+            />
+          </label>
+          <label className="field field--required">
+            <span>Typ</span>
+            <select
+              className={isCatalogFieldInvalid(dataset, row, "kind", showValidation) ? "is-invalid" : ""}
+              value={row.kind ?? "BACTERIAL"}
+              onChange={(event) => onChange({ kind: event.target.value as PathogenKind })}
+              required
+            >
+              <option value="BACTERIAL">bakteriell</option>
+              <option value="NO_GROWTH">kein Wachstum</option>
+              <option value="CONTAMINATED">verunreinigt</option>
+              <option value="OTHER">sonstiges</option>
+            </select>
+          </label>
+          <label className="field">
+            <span>Aktiv</span>
+            <button
+              type="button"
+              className={`eye-button admin-catalog-form__toggle ${row.active ? "is-active" : "is-inactive"}`}
+              onClick={() => onChange({ active: !row.active })}
+            >
+              {row.active ? "sichtbar" : "inaktiv"}
+            </button>
+          </label>
+        </div>
+      ) : null}
+
+      {dataset === "antibiotics" ? (
+        <div className="field-grid">
+          <label className="field field--required field--wide">
+            <span>Name</span>
+            <input
+              className={isCatalogFieldInvalid(dataset, row, "name", showValidation) ? "is-invalid" : ""}
+              value={row.name ?? ""}
+              onChange={(event) => onChange({ name: event.target.value })}
+              placeholder="Name"
+              required
+            />
+          </label>
+          <label className="field">
+            <span>Kuerzel</span>
+            <input
+              value={row.code ?? ""}
+              onChange={(event) => onChange({ code: event.target.value })}
+              placeholder="Kuerzel"
+            />
+          </label>
+          <label className="field">
+            <span>Aktiv</span>
+            <button
+              type="button"
+              className={`eye-button admin-catalog-form__toggle ${row.active ? "is-active" : "is-inactive"}`}
+              onClick={() => onChange({ active: !row.active })}
+            >
+              {row.active ? "sichtbar" : "inaktiv"}
+            </button>
+          </label>
+        </div>
+      ) : null}
+    </article>
+  );
+}
+
+function FarmerForm({
+  row,
+  onChange,
+  showValidation,
+}: {
+  row: EditableRow;
+  onChange: (patch: Partial<EditableRow>) => void;
+  showValidation: boolean;
+}) {
+  return (
+    <article className="admin-farmer-card">
+      <div className="admin-farmer-card__row admin-farmer-card__row--primary">
+        <label className="field field--required">
+          <span>Firmenname</span>
+          <input
+            className={isFarmerFieldInvalid(row, "companyName", showValidation) ? "is-invalid" : ""}
+            value={row.companyName ?? ""}
+            onChange={(event) => onChange({ companyName: event.target.value })}
+            placeholder="Firmenname"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Ansprechpartner</span>
+          <input
+            className={isFarmerFieldInvalid(row, "contactPerson", showValidation) ? "is-invalid" : ""}
+            value={row.contactPerson ?? ""}
+            onChange={(event) => onChange({ contactPerson: event.target.value })}
+            placeholder="Ansprechpartner"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Kunden-Nr.</span>
+          <input
+            className={isFarmerFieldInvalid(row, "customerNumber", showValidation) ? "is-invalid" : ""}
+            value={row.customerNumber ?? ""}
+            onChange={(event) => onChange({ customerNumber: event.target.value })}
+            placeholder="Kunden-Nr."
+            required
+          />
+        </label>
+      </div>
+
+      <div className="admin-farmer-card__row admin-farmer-card__row--address">
+        <label className="field field--required">
+          <span>PLZ</span>
+          <input
+            className={isFarmerFieldInvalid(row, "postalCode", showValidation) ? "is-invalid" : ""}
+            value={row.postalCode ?? ""}
+            onChange={(event) => onChange({ postalCode: event.target.value })}
+            placeholder="PLZ"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Ort</span>
+          <input
+            className={isFarmerFieldInvalid(row, "city", showValidation) ? "is-invalid" : ""}
+            value={row.city ?? ""}
+            onChange={(event) => onChange({ city: event.target.value })}
+            placeholder="Ort"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Straße</span>
+          <input
+            className={isFarmerFieldInvalid(row, "street", showValidation) ? "is-invalid" : ""}
+            value={row.street ?? ""}
+            onChange={(event) => onChange({ street: event.target.value })}
+            placeholder="Straße"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Hausnummer</span>
+          <input
+            className={isFarmerFieldInvalid(row, "houseNumber", showValidation) ? "is-invalid" : ""}
+            value={row.houseNumber ?? ""}
+            onChange={(event) => onChange({ houseNumber: event.target.value })}
+            placeholder="Hausnummer"
+            required
+          />
+        </label>
+      </div>
+
+      <div className="admin-farmer-card__row admin-farmer-card__row--contact">
+        <label className="field field--required">
+          <span>E-Mail</span>
+          <input
+            className={isFarmerFieldInvalid(row, "email", showValidation) ? "is-invalid" : ""}
+            value={row.email ?? ""}
+            onChange={(event) => onChange({ email: event.target.value })}
+            placeholder="E-Mail"
+            required
+          />
+        </label>
+        <label className="field field--required">
+          <span>Telefon</span>
+          <input
+            className={isFarmerFieldInvalid(row, "phoneNumber", showValidation) ? "is-invalid" : ""}
+            value={row.phoneNumber ?? ""}
+            onChange={(event) => onChange({ phoneNumber: event.target.value })}
+            placeholder="Telefon"
+            required
+          />
+        </label>
+      </div>
+
+      <div className="admin-farmer-card__row admin-farmer-card__row--toggle">
+        <label className="field">
+          <span>Aktiv</span>
+          <button
+            type="button"
+            className={`eye-button admin-farmer-card__toggle ${row.active ? "is-active" : "is-inactive"}`}
+            onClick={() => onChange({ active: !row.active })}
+          >
+            {row.active ? "sichtbar" : "inaktiv"}
+          </button>
+        </label>
+      </div>
+    </article>
+  );
+}
+
 function normalizeOverview(overview: AdministrationOverview): DatasetsState {
   return {
     farmers: overview.farmers.map((entry) => ({
@@ -166,7 +534,14 @@ export default function AdministrationPage() {
   const [datasets, setDatasets] = useState<DatasetsState | null>(null);
   const [saving, setSaving] = useState(false);
   const [message, setMessage] = useState<string | null>(null);
-  const [showValidation, setShowValidation] = useState(false);
+  const [newFarmerDraft, setNewFarmerDraft] = useState<EditableRow | null>(null);
+  const [editingFarmer, setEditingFarmer] = useState<EditableRow | null>(null);
+  const [showCreateValidation, setShowCreateValidation] = useState(false);
+  const [showEditValidation, setShowEditValidation] = useState(false);
+  const [newCatalogDraft, setNewCatalogDraft] = useState<EditableRow | null>(null);
+  const [editingCatalogRow, setEditingCatalogRow] = useState<EditableRow | null>(null);
+  const [showCatalogCreateValidation, setShowCatalogCreateValidation] = useState(false);
+  const [showCatalogEditValidation, setShowCatalogEditValidation] = useState(false);
 
   const selectedDataset: DatasetKey = useMemo(() => {
     if (location.pathname.startsWith("/admin/medikamente")) {
@@ -196,94 +571,171 @@ export default function AdministrationPage() {
 
   const rows = useMemo(() => datasets?.[selectedDataset] ?? [], [datasets, selectedDataset]);
   const isFarmerDataset = selectedDataset === "farmers";
+  const catalogDataset = selectedDataset === "farmers" ? null : selectedDataset;
 
-  function updateRow(index: number, patch: Partial<EditableRow>) {
-    setDatasets((current) => {
-      if (!current) {
-        return current;
-      }
-      const nextRows = current[selectedDataset].map((row, rowIndex) =>
-        rowIndex === index ? { ...row, ...patch } : row,
-      );
-      return {
-        ...current,
-        [selectedDataset]: nextRows,
-      };
-    });
+  useEffect(() => {
+    setNewFarmerDraft(null);
+    setEditingFarmer(null);
+    setShowCreateValidation(false);
+    setShowEditValidation(false);
+    setNewCatalogDraft(null);
+    setEditingCatalogRow(null);
+    setShowCatalogCreateValidation(false);
+    setShowCatalogEditValidation(false);
+  }, [selectedDataset]);
+
+  async function saveFarmers(rowsToSave: EditableRow[]) {
+    const response = await apiPost<EditableRow[]>("/catalog/farmers", rowsToSave.map(mapFarmerMutation));
+    setDatasets((current) => (current ? { ...current, farmers: response } : current));
   }
 
-  function addRow() {
-    setDatasets((current) => {
-      if (!current) {
-        return current;
-      }
-      return {
-        ...current,
-        [selectedDataset]: [...current[selectedDataset], emptyRow(selectedDataset)],
-      };
-    });
+  async function saveCatalogRows(dataset: CatalogDatasetKey, rowsToSave: EditableRow[]) {
+    let response: EditableRow[];
+
+    switch (dataset) {
+      case "medications":
+        response = await apiPost<EditableRow[]>("/catalog/medications", rowsToSave.map((row) => ({
+          id: row.id || null,
+          name: row.name,
+          category: row.category,
+          active: row.active,
+        })));
+        break;
+      case "pathogens":
+        response = await apiPost<EditableRow[]>("/catalog/pathogens", rowsToSave.map((row) => ({
+          id: row.id || null,
+          code: row.code || null,
+          name: row.name,
+          kind: row.kind,
+          active: row.active,
+        })));
+        break;
+      case "antibiotics":
+        response = await apiPost<EditableRow[]>("/catalog/antibiotics", rowsToSave.map((row) => ({
+          id: row.id || null,
+          code: row.code || null,
+          name: row.name,
+          active: row.active,
+        })));
+        break;
+    }
+
+    setDatasets((current) => (current ? { ...current, [dataset]: response } : current));
   }
 
-  async function handleSave() {
-    if (!datasets) {
+  function handleStartFarmerCreate() {
+    setNewFarmerDraft(emptyRow("farmers"));
+    setShowCreateValidation(false);
+    setMessage(null);
+  }
+
+  function handleCancelFarmerCreate() {
+    setNewFarmerDraft(null);
+    setShowCreateValidation(false);
+    setMessage(null);
+  }
+
+  async function handleCreateFarmer() {
+    if (!newFarmerDraft) {
       return;
     }
-    setShowValidation(true);
-    if (selectedDataset === "farmers" && rows.some(isFarmerRowIncomplete)) {
+
+    setShowCreateValidation(true);
+    if (isFarmerRowIncomplete(newFarmerDraft)) {
       setMessage("Bitte alle Pflichtfelder fuer den Landwirt ausfuellen.");
       return;
     }
-    if (selectedDataset !== "farmers" && rows.some((row) => !row.name?.trim())) {
-      setMessage("Bitte alle Pflichtfelder ausfuellen.");
-      return;
-    }
+
     setSaving(true);
     setMessage(null);
     try {
-      let response: EditableRow[];
-      switch (selectedDataset) {
-        case "farmers":
-          response = await apiPost<EditableRow[]>("/catalog/farmers", rows.map((row) => ({
-            id: row.id || null,
-            customerNumber: row.customerNumber || null,
-            companyName: row.companyName,
-            contactPerson: row.contactPerson || null,
-            street: row.street || null,
-            houseNumber: row.houseNumber || null,
-            postalCode: row.postalCode || null,
-            city: row.city || null,
-            email: row.email || null,
-            phoneNumber: row.phoneNumber || null,
-            active: row.active,
-          })));
-          break;
-        case "medications":
-          response = await apiPost<EditableRow[]>("/catalog/medications", rows.map((row) => ({
-            id: row.id || null,
-            name: row.name,
-            category: row.category,
-            active: row.active,
-          })));
-          break;
-        case "pathogens":
-          response = await apiPost<EditableRow[]>("/catalog/pathogens", rows.map((row) => ({
-            id: row.id || null,
-            code: row.code || null,
-            name: row.name,
-            kind: row.kind,
-            active: row.active,
-          })));
-          break;
-        case "antibiotics":
-          response = await apiPost<EditableRow[]>("/catalog/antibiotics", rows.map((row) => ({
-            id: row.id || null,
-            code: row.code || null,
-            name: row.name,
-            active: row.active,
-          })));
-          break;
-      }
-      setDatasets((current) => (current ? { ...current, [selectedDataset]: response } : current));
+      await saveFarmers([newFarmerDraft]);
+      setNewFarmerDraft(null);
+      setShowCreateValidation(false);
+      setMessage("Landwirt gespeichert.");
+    } catch (saveError) {
+      setMessage((saveError as Error).message);
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  function openFarmerDialog(row: EditableRow) {
+    setEditingFarmer({ ...row });
+    setShowEditValidation(false);
+    setMessage(null);
+  }
+
+  function closeFarmerDialog() {
+    setEditingFarmer(null);
+    setShowEditValidation(false);
+  }
+
+  async function handleSaveFarmerEdit() {
+    if (!editingFarmer) {
+      return;
+    }
+
+    setShowEditValidation(true);
+    if (isFarmerRowIncomplete(editingFarmer)) {
+      setMessage("Bitte alle Pflichtfelder fuer den Landwirt ausfuellen.");
+      return;
+    }
+
+    setSaving(true);
+    setMessage(null);
+    try {
+      await saveFarmers([editingFarmer]);
+      setEditingFarmer(null);
+      setShowEditValidation(false);
+      setMessage("Landwirt gespeichert.");
+    } catch (saveError) {
+      setMessage((saveError as Error).message);
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  function handleFarmerRowKeyDown(event: ReactKeyboardEvent<HTMLTableRowElement>, row: EditableRow) {
+    if (event.key !== "Enter" && event.key !== " ") {
+      return;
+    }
+    event.preventDefault();
+    openFarmerDialog(row);
+  }
+
+  function handleStartCatalogCreate() {
+    if (!catalogDataset) {
+      return;
+    }
+    setNewCatalogDraft(emptyRow(catalogDataset));
+    setShowCatalogCreateValidation(false);
+    setMessage(null);
+  }
+
+  function handleCancelCatalogCreate() {
+    setNewCatalogDraft(null);
+    setShowCatalogCreateValidation(false);
+    setMessage(null);
+  }
+
+  async function handleCreateCatalogEntry() {
+    if (!catalogDataset || !newCatalogDraft) {
+      return;
+    }
+
+    setShowCatalogCreateValidation(true);
+    if (isCatalogRowIncomplete(catalogDataset, newCatalogDraft)) {
+      setMessage("Bitte alle Pflichtfelder ausfuellen.");
+      return;
+    }
+
+    setSaving(true);
+    setMessage(null);
+    try {
+      await saveCatalogRows(catalogDataset, [newCatalogDraft]);
+      setNewCatalogDraft(null);
+      setShowCatalogCreateValidation(false);
       setMessage("Aenderungen gespeichert.");
     } catch (saveError) {
       setMessage((saveError as Error).message);
@@ -292,6 +744,50 @@ export default function AdministrationPage() {
     }
   }
 
+  function openCatalogDialog(row: EditableRow) {
+    setEditingCatalogRow({ ...row });
+    setShowCatalogEditValidation(false);
+    setMessage(null);
+  }
+
+  function closeCatalogDialog() {
+    setEditingCatalogRow(null);
+    setShowCatalogEditValidation(false);
+  }
+
+  async function handleSaveCatalogEdit() {
+    if (!catalogDataset || !editingCatalogRow) {
+      return;
+    }
+
+    setShowCatalogEditValidation(true);
+    if (isCatalogRowIncomplete(catalogDataset, editingCatalogRow)) {
+      setMessage("Bitte alle Pflichtfelder ausfuellen.");
+      return;
+    }
+
+    setSaving(true);
+    setMessage(null);
+    try {
+      await saveCatalogRows(catalogDataset, [editingCatalogRow]);
+      setEditingCatalogRow(null);
+      setShowCatalogEditValidation(false);
+      setMessage("Aenderungen gespeichert.");
+    } catch (saveError) {
+      setMessage((saveError as Error).message);
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  function handleCatalogRowKeyDown(event: ReactKeyboardEvent<HTMLTableRowElement>, row: EditableRow) {
+    if (event.key !== "Enter" && event.key !== " ") {
+      return;
+    }
+    event.preventDefault();
+    openCatalogDialog(row);
+  }
+
   return (
     <div className="page-stack">
       <section className="section-card section-card--hero">
@@ -299,8 +795,8 @@ export default function AdministrationPage() {
           <p className="eyebrow">Verwaltung</p>
           <h3>{DATASET_TITLES[selectedDataset]}</h3>
           <p className="muted-text">
-            Bestehende Datensaetze lassen sich inline aendern. Bei Umbenennungen bleibt der alte
-            Satz inaktiv sichtbar.
+            Neue Eintraege werden ueber den Button unter der Tabelle erfasst. Bestehende Eintraege lassen sich per
+            Klick in der Tabelle bearbeiten.
           </p>
         </div>
 
@@ -314,213 +810,275 @@ export default function AdministrationPage() {
       <section className="section-card">
         <div className="section-card__header">
           <div>
-            <p className="eyebrow">Datensatz</p>
             <h3>{DATASET_LABELS[selectedDataset]}</h3>
           </div>
         </div>
 
         {isFarmerDataset ? (
           <div className="admin-farmer-list">
-            {rows.map((row, index) => (
-              <article key={`${row.id || "new"}-${index}`} className="admin-farmer-card">
-                <div className="admin-farmer-card__row admin-farmer-card__row--primary">
-                  <label className="field field--required">
-                    <span>Firmenname</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "companyName", showValidation) ? "is-invalid" : ""}
-                      value={row.companyName ?? ""}
-                      onChange={(event) => updateRow(index, { companyName: event.target.value })}
-                      placeholder="Firmenname"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Ansprechpartner</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "contactPerson", showValidation) ? "is-invalid" : ""}
-                      value={row.contactPerson ?? ""}
-                      onChange={(event) => updateRow(index, { contactPerson: event.target.value })}
-                      placeholder="Ansprechpartner"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Kunden-Nr.</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "customerNumber", showValidation) ? "is-invalid" : ""}
-                      value={row.customerNumber ?? ""}
-                      onChange={(event) => updateRow(index, { customerNumber: event.target.value })}
-                      placeholder="Kunden-Nr."
-                      required
-                    />
-                  </label>
-                </div>
+            <div className="admin-farmer-section">
+              <div>
+                <p className="muted-text">Zum Bearbeiten eine Zeile anklicken.</p>
+              </div>
 
-                <div className="admin-farmer-card__row admin-farmer-card__row--address">
-                  <label className="field field--required">
-                    <span>PLZ</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "postalCode", showValidation) ? "is-invalid" : ""}
-                      value={row.postalCode ?? ""}
-                      onChange={(event) => updateRow(index, { postalCode: event.target.value })}
-                      placeholder="PLZ"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Ort</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "city", showValidation) ? "is-invalid" : ""}
-                      value={row.city ?? ""}
-                      onChange={(event) => updateRow(index, { city: event.target.value })}
-                      placeholder="Ort"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Straße</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "street", showValidation) ? "is-invalid" : ""}
-                      value={row.street ?? ""}
-                      onChange={(event) => updateRow(index, { street: event.target.value })}
-                      placeholder="Straße"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Hausnummer</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "houseNumber", showValidation) ? "is-invalid" : ""}
-                      value={row.houseNumber ?? ""}
-                      onChange={(event) => updateRow(index, { houseNumber: event.target.value })}
-                      placeholder="Hausnummer"
-                      required
-                    />
-                  </label>
-                </div>
+              <div className="table-shell">
+                <table className="data-table">
+                  <thead>
+                    <tr>
+                      <th>Firma</th>
+                      <th>Ansprechpartner</th>
+                      <th>Telefon</th>
+                      <th>E-Mail</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {rows.length ? (
+                      rows.map((row, index) => (
+                        <tr
+                          key={`${row.id || row.businessKey || "farmer"}-${index}`}
+                          className="admin-farmer-table__row"
+                          tabIndex={0}
+                          role="button"
+                          onClick={() => openFarmerDialog(row)}
+                          onKeyDown={(event) => handleFarmerRowKeyDown(event, row)}
+                        >
+                          <td>{row.companyName || "-"}</td>
+                          <td>{row.contactPerson || "-"}</td>
+                          <td>{row.phoneNumber || "-"}</td>
+                          <td>{row.email || "-"}</td>
+                        </tr>
+                      ))
+                    ) : (
+                      <tr>
+                        <td colSpan={4} className="admin-farmer-table__empty">
+                          Noch keine Landwirte vorhanden.
+                        </td>
+                      </tr>
+                    )}
+                  </tbody>
+                </table>
+              </div>
 
-                <div className="admin-farmer-card__row admin-farmer-card__row--contact">
-                  <label className="field field--required">
-                    <span>E-Mail</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "email", showValidation) ? "is-invalid" : ""}
-                      value={row.email ?? ""}
-                      onChange={(event) => updateRow(index, { email: event.target.value })}
-                      placeholder="E-Mail"
-                      required
-                    />
-                  </label>
-                  <label className="field field--required">
-                    <span>Telefon</span>
-                    <input
-                      className={isFarmerFieldInvalid(row, "phoneNumber", showValidation) ? "is-invalid" : ""}
-                      value={row.phoneNumber ?? ""}
-                      onChange={(event) => updateRow(index, { phoneNumber: event.target.value })}
-                      placeholder="Telefon"
-                      required
-                    />
-                  </label>
-                </div>
-
-                <div className="admin-farmer-card__row admin-farmer-card__row--toggle">
-                  <label className="field">
-                    <span>Aktiv</span>
-                    <button
-                      type="button"
-                      className={`eye-button admin-farmer-card__toggle ${row.active ? "is-active" : "is-inactive"}`}
-                      onClick={() => updateRow(index, { active: !row.active })}
-                    >
-                      {row.active ? "sichtbar" : "inaktiv"}
-                    </button>
-                  </label>
-                </div>
-              </article>
-            ))}
+              <div className="page-actions page-actions--space-between">
+                <button type="button" className="secondary-button" onClick={handleStartFarmerCreate}>
+                  Anlegen
+                </button>
+              </div>
+            </div>
           </div>
         ) : (
-          <div className="table-shell">
-            <table className="data-table">
-              <thead>
-                <tr>
-                  <th className="required-label">Name</th>
-                  {selectedDataset === "medications" ? <th>Kategorie</th> : null}
-                  {selectedDataset === "pathogens" || selectedDataset === "antibiotics" ? <th>Kuerzel</th> : null}
-                  {selectedDataset === "pathogens" ? <th>Typ</th> : null}
-                  <th>Aktiv</th>
-                </tr>
-              </thead>
-              <tbody>
-                {rows.map((row, index) => (
-                  <tr key={`${row.id || "new"}-${index}`}>
-                    <td>
-                      <input
-                        className={showValidation && !row.name?.trim() ? "is-invalid" : ""}
-                        value={row.name ?? ""}
-                        onChange={(event) => updateRow(index, { name: event.target.value })}
-                      />
-                    </td>
-                    {selectedDataset === "medications" ? (
-                      <td>
-                        <select
-                          value={row.category}
-                          onChange={(event) =>
-                            updateRow(index, { category: event.target.value as MedicationCategory })
+          <div className="admin-catalog-list">
+            <div className="admin-catalog-section">
+              <div>
+                <p className="muted-text">Zum Bearbeiten eine Zeile anklicken.</p>
+              </div>
+
+              <div className="table-shell">
+                <table className="data-table">
+                  <thead>
+                    <tr>
+                      <th>Name</th>
+                      {selectedDataset === "medications" ? <th>Kategorie</th> : null}
+                      {selectedDataset === "pathogens" || selectedDataset === "antibiotics" ? <th>Kuerzel</th> : null}
+                      {selectedDataset === "pathogens" ? <th>Typ</th> : null}
+                      <th>Aktiv</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {rows.length ? (
+                      rows.map((row, index) => (
+                        <tr
+                          key={`${row.id || row.businessKey || "catalog"}-${index}`}
+                          className="admin-catalog-table__row"
+                          tabIndex={0}
+                          role="button"
+                          onClick={() => openCatalogDialog(row)}
+                          onKeyDown={(event) => handleCatalogRowKeyDown(event, row)}
+                        >
+                          <td>{row.name || "-"}</td>
+                          {selectedDataset === "medications" ? <td>{medicationCategoryLabel(row.category)}</td> : null}
+                          {selectedDataset === "pathogens" || selectedDataset === "antibiotics" ? (
+                            <td>{row.code || "-"}</td>
+                          ) : null}
+                          {selectedDataset === "pathogens" ? <td>{pathogenKindLabel(row.kind)}</td> : null}
+                          <td>{row.active ? "sichtbar" : "inaktiv"}</td>
+                        </tr>
+                      ))
+                    ) : (
+                      <tr>
+                        <td
+                          colSpan={
+                            selectedDataset === "pathogens"
+                              ? 4
+                              : selectedDataset === "medications" || selectedDataset === "antibiotics"
+                                ? 3
+                                : 2
                           }
+                          className="admin-catalog-table__empty"
                         >
-                          <option value="IN_UDDER">ins Euter</option>
-                          <option value="SYSTEMIC_ANTIBIOTIC">systemisch Antibiotika</option>
-                          <option value="SYSTEMIC_PAIN">systemisch Schmerzmittel</option>
-                          <option value="DRY_SEALER">Versiegler</option>
-                          <option value="DRY_ANTIBIOTIC">Trockenstellerprobe Antibiotika</option>
-                        </select>
-                      </td>
-                    ) : null}
-                    {selectedDataset === "pathogens" || selectedDataset === "antibiotics" ? (
-                      <td>
-                        <input
-                          value={row.code ?? ""}
-                          onChange={(event) => updateRow(index, { code: event.target.value })}
-                        />
-                      </td>
-                    ) : null}
-                    {selectedDataset === "pathogens" ? (
-                      <td>
-                        <select
-                          value={row.kind}
-                          onChange={(event) => updateRow(index, { kind: event.target.value as PathogenKind })}
-                        >
-                          <option value="BACTERIAL">bakteriell</option>
-                          <option value="NO_GROWTH">kein Wachstum</option>
-                          <option value="CONTAMINATED">verunreinigt</option>
-                          <option value="OTHER">sonstiges</option>
-                        </select>
-                      </td>
-                    ) : null}
-                    <td>
-                      <button
-                        type="button"
-                        className={`eye-button ${row.active ? "is-active" : "is-inactive"}`}
-                        onClick={() => updateRow(index, { active: !row.active })}
-                      >
-                        {row.active ? "sichtbar" : "inaktiv"}
-                      </button>
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
+                          {catalogEmptyMessage(selectedDataset)}
+                        </td>
+                      </tr>
+                    )}
+                  </tbody>
+                </table>
+              </div>
+
+              <div className="page-actions page-actions--space-between">
+                <button type="button" className="secondary-button" onClick={handleStartCatalogCreate}>
+                  Anlegen
+                </button>
+              </div>
+            </div>
           </div>
         )}
-
-        <div className="page-actions page-actions--space-between">
-          <button type="button" className="secondary-button" onClick={addRow}>
-            Anlegen
-          </button>
-          <button type="button" className="accent-button" onClick={() => void handleSave()} disabled={saving}>
-            {saving ? "Speichern ..." : "Speichern"}
-          </button>
-        </div>
       </section>
+
+      {newFarmerDraft ? (
+        <div className="dialog-backdrop" onClick={handleCancelFarmerCreate}>
+          <div className="dialog" onClick={(event) => event.stopPropagation()}>
+            <div className="dialog__body dialog__body--farmer">
+              <FarmerForm
+                row={newFarmerDraft}
+                onChange={(patch) =>
+                  setNewFarmerDraft((current) => (current ? { ...current, ...patch } : current))
+                }
+                showValidation={showCreateValidation}
+              />
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
+              <button
+                type="button"
+                className="secondary-button"
+                onClick={handleCancelFarmerCreate}
+                disabled={saving}
+              >
+                Abbrechen
+              </button>
+              <button
+                type="button"
+                className="accent-button"
+                onClick={() => void handleCreateFarmer()}
+                disabled={saving}
+              >
+                {saving ? "Speichern ..." : "Speichern"}
+              </button>
+            </div>
+          </div>
+        </div>
+      ) : null}
+
+      {editingFarmer ? (
+        <div className="dialog-backdrop" onClick={closeFarmerDialog}>
+          <div className="dialog" onClick={(event) => event.stopPropagation()}>
+            <div className="dialog__header">
+              <div>
+                <p className="eyebrow">Bearbeitung</p>
+                <h4>Landwirt bearbeiten</h4>
+              </div>
+            </div>
+
+            <div className="dialog__body dialog__body--farmer">
+              <FarmerForm
+                row={editingFarmer}
+                onChange={(patch) =>
+                  setEditingFarmer((current) => (current ? { ...current, ...patch } : current))
+                }
+                showValidation={showEditValidation}
+              />
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
+              <button type="button" className="secondary-button" onClick={closeFarmerDialog} disabled={saving}>
+                Abbrechen
+              </button>
+              <button
+                type="button"
+                className="accent-button"
+                onClick={() => void handleSaveFarmerEdit()}
+                disabled={saving}
+              >
+                {saving ? "Speichern ..." : "Speichern"}
+              </button>
+            </div>
+          </div>
+        </div>
+      ) : null}
+
+      {catalogDataset && newCatalogDraft ? (
+        <div className="dialog-backdrop" onClick={handleCancelCatalogCreate}>
+          <div className="dialog" onClick={(event) => event.stopPropagation()}>
+            <div className="dialog__body dialog__body--form">
+              <CatalogForm
+                dataset={catalogDataset}
+                row={newCatalogDraft}
+                onChange={(patch) =>
+                  setNewCatalogDraft((current) => (current ? { ...current, ...patch } : current))
+                }
+                showValidation={showCatalogCreateValidation}
+              />
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
+              <button
+                type="button"
+                className="secondary-button"
+                onClick={handleCancelCatalogCreate}
+                disabled={saving}
+              >
+                Abbrechen
+              </button>
+              <button
+                type="button"
+                className="accent-button"
+                onClick={() => void handleCreateCatalogEntry()}
+                disabled={saving}
+              >
+                {saving ? "Speichern ..." : "Speichern"}
+              </button>
+            </div>
+          </div>
+        </div>
+      ) : null}
+
+      {catalogDataset && editingCatalogRow ? (
+        <div className="dialog-backdrop" onClick={closeCatalogDialog}>
+          <div className="dialog" onClick={(event) => event.stopPropagation()}>
+            <div className="dialog__header">
+              <div>
+                <p className="eyebrow">Bearbeitung</p>
+                <h4>{catalogDialogTitle(catalogDataset)}</h4>
+              </div>
+            </div>
+
+            <div className="dialog__body dialog__body--form">
+              <CatalogForm
+                dataset={catalogDataset}
+                row={editingCatalogRow}
+                onChange={(patch) =>
+                  setEditingCatalogRow((current) => (current ? { ...current, ...patch } : current))
+                }
+                showValidation={showCatalogEditValidation}
+              />
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
+              <button type="button" className="secondary-button" onClick={closeCatalogDialog} disabled={saving}>
+                Abbrechen
+              </button>
+              <button
+                type="button"
+                className="accent-button"
+                onClick={() => void handleSaveCatalogEdit()}
+                disabled={saving}
+              >
+                {saving ? "Speichern ..." : "Speichern"}
+              </button>
+            </div>
+          </div>
+        </div>
+      ) : null}
     </div>
   );
 }
diff --git a/frontend/src/pages/UserManagementPage.tsx b/frontend/src/pages/UserManagementPage.tsx
index b568d80..e384010 100644
--- a/frontend/src/pages/UserManagementPage.tsx
+++ b/frontend/src/pages/UserManagementPage.tsx
@@ -58,6 +58,29 @@ export default function UserManagementPage() {
     }
   }, [user]);
 
+  function resetProfileData() {
+    setProfileData({
+      displayName: user?.displayName || "",
+      companyName: user?.companyName || "",
+      street: user?.street || "",
+      houseNumber: user?.houseNumber || "",
+      postalCode: user?.postalCode || "",
+      city: user?.city || "",
+      email: user?.email || "",
+      phoneNumber: user?.phoneNumber || "",
+    });
+  }
+
+  function openProfileDialog() {
+    resetProfileData();
+    setShowProfileForm(true);
+  }
+
+  function closeProfileDialog() {
+    resetProfileData();
+    setShowProfileForm(false);
+  }
+
   useEffect(() => {
     async function loadUsers() {
       try {
@@ -170,6 +193,14 @@ export default function UserManagementPage() {
     }
   }
 
+  function closeCreateUserDialog() {
+    setShowCreateForm(false);
+    setNewUserName("");
+    setNewUserEmail("");
+    setNewUserPassword("");
+    setNewUserPasswordConfirm("");
+  }
+
   async function handleSaveProfile(e: React.FormEvent) {
     e.preventDefault();
     if (!profileData.displayName.trim()) {
@@ -269,36 +300,191 @@ export default function UserManagementPage() {
       {/* Own Profile Form (nur für Hauptbenutzer) */}
       {isPrimaryUser && !isAdmin && (
         <section className="section-card">
-          {!showProfileForm ? (
-            <div className="section-card__header">
+          <div className="section-card__header user-management-page__profile-header">
+            <div>
+              <p className="eyebrow">Meine Stammdaten</p>
+              <h3>{user?.displayName}</h3>
+            </div>
+            <button
+              type="button"
+              className="accent-button"
+              onClick={openProfileDialog}
+            >
+              Bearbeiten
+            </button>
+          </div>
+        </section>
+      )}
+
+      {/* Tabelle mit Benutzern */}
+      <section className="section-card">
+        <div className="section-card__header">
+          <div>
+            <p className="eyebrow">{isAdmin ? "Hauptnutzer" : "Unterbenutzer"}</p>
+            <h3>{isAdmin ? "Registrierte Hauptnutzer" : "Ihre Unterbenutzer"}</h3>
+          </div>
+        </div>
+
+        {loading ? (
+          <div className="empty-state">Benutzer werden geladen...</div>
+        ) : users.length === 0 ? (
+          <div className="empty-state">
+            {isAdmin ? "Keine Hauptnutzer vorhanden." : "Keine Unterbenutzer vorhanden."}
+          </div>
+        ) : (
+          <div className="table-shell">
+            <table className="data-table">
+              <thead>
+                <tr>
+                  <th>Name</th>
+                  {isAdmin && <th>Firma</th>}
+                  <th>E-Mail</th>
+                  <th>Status</th>
+                  <th>Letzte Änderung</th>
+                  <th>Aktion</th>
+                </tr>
+              </thead>
+              <tbody>
+                {users.map((entry) => (
+                  <tr key={entry.id} className={!entry.active ? "table-row--inactive" : ""}>
+                    <td>
+                      <strong>{entry.displayName}</strong>
+                    </td>
+                    {isAdmin && <td>{(entry as SubUserRow & { companyName?: string }).companyName ?? "-"}</td>}
+                    <td>{entry.email ?? "-"}</td>
+                    <td>
+                      <span
+                        className={`status-pill ${
+                          entry.active ? "status-pill--active" : "status-pill--inactive"
+                        }`}
+                      >
+                        {entry.active ? "Freigegeben" : "Gesperrt"}
+                      </span>
+                    </td>
+                    <td className="text-muted">{formatDate(entry.updatedAt)}</td>
+                    <td>
+                      <button
+                        type="button"
+                        className={`action-button ${
+                          entry.active ? "action-button--danger" : "action-button--success"
+                        }`}
+                        onClick={() => toggleUserStatus(entry.id, !entry.active)}
+                      >
+                        {entry.active ? "Sperren" : "Freigeben"}
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+
+        {isPrimaryUser && !isAdmin ? (
+          <div className="page-actions page-actions--space-between user-management-page__create-action">
+            <button
+              type="button"
+              className="accent-button"
+              onClick={() => setShowCreateForm(true)}
+            >
+              + Benutzer anlegen
+            </button>
+          </div>
+        ) : null}
+      </section>
+
+      {isPrimaryUser && !isAdmin && showCreateForm ? (
+        <div className="dialog-backdrop" onClick={closeCreateUserDialog}>
+          <form className="dialog" onClick={(event) => event.stopPropagation()} onSubmit={handleCreateUser}>
+            <div className="dialog__header">
               <div>
-                <p className="eyebrow">Meine Stammdaten</p>
-                <h3>{user?.displayName}</h3>
+                <p className="eyebrow">Neuer Unterbenutzer</p>
+                <h4>Benutzer anlegen</h4>
               </div>
+            </div>
+
+            <div className="dialog__body dialog__body--form">
+              <div className="field-grid field-grid--2col">
+                <label className="field">
+                  <span>Name *</span>
+                  <input
+                    type="text"
+                    value={newUserName}
+                    onChange={(e) => setNewUserName(e.target.value)}
+                    placeholder="Name des Benutzers"
+                    autoComplete="off"
+                    required
+                  />
+                </label>
+                <label className="field">
+                  <span>E-Mail *</span>
+                  <input
+                    type="email"
+                    value={newUserEmail}
+                    onChange={(e) => setNewUserEmail(e.target.value)}
+                    placeholder="email@beispiel.de"
+                    autoComplete="off"
+                    required
+                  />
+                </label>
+                <label className="field">
+                  <span>Passwort *</span>
+                  <input
+                    type="password"
+                    value={newUserPassword}
+                    onChange={(e) => setNewUserPassword(e.target.value)}
+                    placeholder="Passwort"
+                    autoComplete="new-password"
+                    required
+                  />
+                </label>
+                <label className="field">
+                  <span>Passwort wiederholen *</span>
+                  <input
+                    type="password"
+                    value={newUserPasswordConfirm}
+                    onChange={(e) => setNewUserPasswordConfirm(e.target.value)}
+                    placeholder="Passwort wiederholen"
+                    autoComplete="new-password"
+                    required
+                  />
+                </label>
+              </div>
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
               <button
                 type="button"
-                className="accent-button"
-                onClick={() => setShowProfileForm(true)}
+                className="secondary-button"
+                onClick={closeCreateUserDialog}
+                disabled={creating}
               >
-                Bearbeiten
+                Abbrechen
+              </button>
+              <button
+                type="submit"
+                className="accent-button"
+                disabled={creating}
+              >
+                {creating ? "Wird erstellt..." : "Benutzer erstellen"}
               </button>
             </div>
-          ) : (
-            <>
-              <div className="section-card__header">
-                <div>
-                  <p className="eyebrow">Meine Stammdaten</p>
-                  <h3>Stammdaten bearbeiten</h3>
-                </div>
-                <button
-                  type="button"
-                  className="ghost-button"
-                  onClick={() => setShowProfileForm(false)}
-                >
-                  Abbrechen
-                </button>
+          </form>
+        </div>
+      ) : null}
+
+      {isPrimaryUser && !isAdmin && showProfileForm ? (
+        <div className="dialog-backdrop" onClick={closeProfileDialog}>
+          <form className="dialog" onClick={(event) => event.stopPropagation()} onSubmit={handleSaveProfile}>
+            <div className="dialog__header">
+              <div>
+                <p className="eyebrow">Meine Stammdaten</p>
+                <h4>Stammdaten bearbeiten</h4>
               </div>
-              <form onSubmit={handleSaveProfile} className="field-grid field-grid--2col">
+            </div>
+
+            <div className="dialog__body dialog__body--form">
+              <div className="field-grid field-grid--2col">
                 <label className="field">
                   <span>Name *</span>
                   <input
@@ -372,190 +558,29 @@ export default function UserManagementPage() {
                     placeholder="Telefonnummer"
                   />
                 </label>
-                <div className="field" style={{ gridColumn: "1 / -1" }}>
-                  <button
-                    type="submit"
-                    className="accent-button"
-                    disabled={savingProfile}
-                  >
-                    {savingProfile ? "Wird gespeichert..." : "Stammdaten speichern"}
-                  </button>
-                </div>
-              </form>
-            </>
-          )}
-        </section>
-      )}
-
-      {/* Create Sub-user Form (nur für Hauptnutzer) */}
-      {isPrimaryUser && !isAdmin && (
-        <section className="section-card">
-          {!showCreateForm ? (
-            <div className="section-card__header">
-              <div>
-                <p className="eyebrow">Neuer Unterbenutzer</p>
-                <h3>Benutzer anlegen</h3>
               </div>
+            </div>
+
+            <div className="dialog__actions dialog__actions--start">
               <button
                 type="button"
-                className="accent-button"
-                onClick={() => setShowCreateForm(true)}
+                className="secondary-button"
+                onClick={closeProfileDialog}
+                disabled={savingProfile}
               >
-                + Benutzer anlegen
+                Abbrechen
+              </button>
+              <button
+                type="submit"
+                className="accent-button"
+                disabled={savingProfile}
+              >
+                {savingProfile ? "Wird gespeichert..." : "Stammdaten speichern"}
               </button>
             </div>
-          ) : (
-            <>
-              <div className="section-card__header">
-                <div>
-                  <p className="eyebrow">Neuer Unterbenutzer</p>
-                  <h3>Benutzer anlegen</h3>
-                </div>
-                <button
-                  type="button"
-                  className="ghost-button"
-                  onClick={() => setShowCreateForm(false)}
-                >
-                  Abbrechen
-                </button>
-              </div>
-              <form onSubmit={handleCreateUser} className="field-grid field-grid--2col">
-                <label className="field">
-                  <span>Name *</span>
-                  <input
-                    type="text"
-                    value={newUserName}
-                    onChange={(e) => setNewUserName(e.target.value)}
-                    placeholder="Name des Benutzers"
-                    autoComplete="off"
-                    required
-                  />
-                </label>
-                <label className="field">
-                  <span>E-Mail *</span>
-                  <input
-                    type="email"
-                    value={newUserEmail}
-                    onChange={(e) => setNewUserEmail(e.target.value)}
-                    placeholder="email@beispiel.de"
-                    autoComplete="off"
-                    required
-                  />
-                </label>
-                <label className="field">
-                  <span>Passwort *</span>
-                  <input
-                    type="password"
-                    value={newUserPassword}
-                    onChange={(e) => setNewUserPassword(e.target.value)}
-                    placeholder="Passwort"
-                    autoComplete="new-password"
-                    required
-                  />
-                </label>
-                <label className="field">
-                  <span>Passwort wiederholen *</span>
-                  <input
-                    type="password"
-                    value={newUserPasswordConfirm}
-                    onChange={(e) => setNewUserPasswordConfirm(e.target.value)}
-                    placeholder="Passwort wiederholen"
-                    autoComplete="new-password"
-                    required
-                  />
-                </label>
-                <div className="field" style={{ display: "flex", alignItems: "flex-end" }}>
-                  <button
-                    type="submit"
-                    className="accent-button"
-                    disabled={creating}
-                    style={{ width: "100%" }}
-                  >
-                    {creating ? "Wird erstellt..." : "Benutzer erstellen"}
-                  </button>
-                </div>
-              </form>
-            </>
-          )}
-        </section>
-      )}
-
-      {/* Tabelle mit Benutzern */}
-      <section className="section-card">
-        <div className="section-card__header">
-          <div>
-            <p className="eyebrow">{isAdmin ? "Hauptnutzer" : "Unterbenutzer"}</p>
-            <h3>{isAdmin ? "Registrierte Hauptnutzer" : "Ihre Unterbenutzer"}</h3>
-          </div>
+          </form>
         </div>
-
-        {loading ? (
-          <div className="empty-state">Benutzer werden geladen...</div>
-        ) : users.length === 0 ? (
-          <div className="empty-state">
-            {isAdmin ? "Keine Hauptnutzer vorhanden." : "Keine Unterbenutzer vorhanden."}
-          </div>
-        ) : (
-          <div className="table-shell">
-            <table className="data-table">
-              <thead>
-                <tr>
-                  <th>Name</th>
-                  {isAdmin && <th>Firma</th>}
-                  <th>E-Mail</th>
-                  <th>Status</th>
-                  <th>Letzte Änderung</th>
-                  <th>Aktion</th>
-                </tr>
-              </thead>
-              <tbody>
-                {users.map((entry) => (
-                  <tr key={entry.id} className={!entry.active ? "table-row--inactive" : ""}>
-                    <td>
-                      <strong>{entry.displayName}</strong>
-                    </td>
-                    {isAdmin && <td>{(entry as SubUserRow & { companyName?: string }).companyName ?? "-"}</td>}
-                    <td>{entry.email ?? "-"}</td>
-                    <td>
-                      <span
-                        className={`status-pill ${
-                          entry.active ? "status-pill--active" : "status-pill--inactive"
-                        }`}
-                      >
-                        {entry.active ? "Freigegeben" : "Gesperrt"}
-                      </span>
-                    </td>
-                    <td className="text-muted">{formatDate(entry.updatedAt)}</td>
-                    <td>
-                      <button
-                        type="button"
-                        className={`action-button ${
-                          entry.active ? "action-button--danger" : "action-button--success"
-                        }`}
-                        onClick={() => toggleUserStatus(entry.id, !entry.active)}
-                      >
-                        {entry.active ? "Sperren" : "Freigeben"}
-                      </button>
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        )}
-      </section>
-
-      {/* Info-Box */}
-      <section className="section-card">
-        <div className="info-panel">
-          <strong>Hinweis</strong>
-          <p>
-            {isAdmin
-              ? "Hauptnutzer sind die primären Kontoinhaber. Wenn Sie einen Hauptnutzer sperren, können sich dieser und alle zugehörigen Nebennutzer nicht mehr anmelden. Die Daten bleiben erhalten und können durch Freigabe wieder aktiviert werden."
-              : "Unterbenutzer können Proben registrieren und bearbeiten, aber keine neuen Benutzer anlegen. Wenn Sie einen Unterbenutzer sperren, kann sich dieser nicht mehr anmelden."}
-          </p>
-        </div>
-      </section>
+      ) : null}
     </div>
   );
 }
diff --git a/frontend/src/styles/global.css b/frontend/src/styles/global.css
index 9c87fc6..1d5bbd2 100644
--- a/frontend/src/styles/global.css
+++ b/frontend/src/styles/global.css
@@ -570,11 +570,18 @@ a {
   overflow: auto;
 }
 
+.admin-catalog-list,
 .admin-farmer-list {
   display: grid;
   gap: 20px;
 }
 
+.admin-catalog-section,
+.admin-farmer-section {
+  display: grid;
+  gap: 16px;
+}
+
 .admin-farmer-card {
   display: grid;
   gap: 16px;
@@ -584,6 +591,15 @@ a {
   background: rgba(255, 255, 255, 0.42);
 }
 
+.admin-catalog-form {
+  display: grid;
+  gap: 16px;
+  padding: 24px;
+  border: 1px solid rgba(37, 49, 58, 0.08);
+  border-radius: 24px;
+  background: rgba(255, 255, 255, 0.42);
+}
+
 .admin-farmer-card__row {
   display: grid;
   gap: 16px;
@@ -610,6 +626,11 @@ a {
   justify-content: center;
 }
 
+.admin-catalog-form__toggle {
+  min-width: 140px;
+  justify-content: center;
+}
+
 .data-table {
   width: 100%;
   border-collapse: collapse;
@@ -630,6 +651,32 @@ a {
   text-transform: uppercase;
 }
 
+.admin-farmer-table__row {
+  cursor: pointer;
+}
+
+.admin-catalog-table__row {
+  cursor: pointer;
+}
+
+.admin-farmer-table__row:hover,
+.admin-farmer-table__row:focus-visible,
+.admin-catalog-table__row:hover,
+.admin-catalog-table__row:focus-visible {
+  background: rgba(17, 109, 99, 0.08);
+  outline: none;
+}
+
+.admin-farmer-table__empty {
+  color: var(--muted);
+  text-align: center !important;
+}
+
+.admin-catalog-table__empty {
+  color: var(--muted);
+  text-align: center !important;
+}
+
 @media (max-width: 1200px) {
   .admin-farmer-card__row--primary,
   .admin-farmer-card__row--address,
@@ -647,6 +694,7 @@ a {
 }
 
 @media (max-width: 720px) {
+  .admin-catalog-form,
   .admin-farmer-card {
     padding: 18px;
   }
@@ -850,6 +898,14 @@ a {
   justify-content: flex-end;
 }
 
+.user-management-page__create-action {
+  margin-top: 18px;
+}
+
+.user-management-page__profile-header {
+  margin-bottom: 0;
+}
+
 .invoice-template-page {
   min-height: 0;
   overflow: hidden;
@@ -1520,6 +1576,10 @@ a {
   justify-content: flex-end;
 }
 
+.dialog__actions--start {
+  justify-content: flex-start;
+}
+
 .dialog__actions a {
   display: inline-flex;
   align-items: center;
@@ -1531,6 +1591,11 @@ a {
   min-height: 0;
 }
 
+.dialog__body--form,
+.dialog__body--farmer {
+  overflow: auto;
+}
+
 .dialog__body--pdf {
   height: min(80vh, 900px);
 }