diff --git a/frontend/src/api/mail.ts b/frontend/src/api/mail.ts
index fc45788..8b8167d 100644
--- a/frontend/src/api/mail.ts
+++ b/frontend/src/api/mail.ts
@@ -192,7 +192,9 @@ export interface CreateAccountPayload {
   imap_port: number;
   smtp_host: string;
   smtp_port: number;
+  username?: string;
   password: string;
+  is_shared?: boolean;
 }
 
 export interface UpdateAccountPayload {
diff --git a/frontend/src/pages/MailSettings.tsx b/frontend/src/pages/MailSettings.tsx
index f1b3298..56dd6bc 100644
--- a/frontend/src/pages/MailSettings.tsx
+++ b/frontend/src/pages/MailSettings.tsx
@@ -40,7 +40,9 @@ export function MailSettingsPage() {
     imap_port: 993,
     smtp_host: '',
     smtp_port: 587,
+    username: '',
     password: '',
+    is_shared: false,
   });
   const [saving, setSaving] = useState(false);
   const [testing, setTesting] = useState<string | null>(null);
@@ -78,7 +80,9 @@ export function MailSettingsPage() {
         imap_port: 993,
         smtp_host: '',
         smtp_port: 587,
+        username: '',
         password: '',
+        is_shared: false,
       });
     } catch (err: any) {
       toast.error(err?.message || err?.detail || 'Save failed');
@@ -161,6 +165,12 @@ export function MailSettingsPage() {
                   onChange={(e) => setNewAccount((prev) => ({ ...prev, display_name: e.target.value }))}
                   placeholder="John Doe"
                 />
+                <Input
+                  label="Benutzername (IMAP/SMTP)"
+                  value={newAccount.username}
+                  onChange={(e) => setNewAccount((prev) => ({ ...prev, username: e.target.value }))}
+                  placeholder="Leer lassen für E-Mail-Adresse"
+                />
                 <div className="grid grid-cols-2 gap-3">
                   <Input
                     label={t('mail.imapHost')}
@@ -196,6 +206,15 @@ export function MailSettingsPage() {
                   onChange={(e) => setNewAccount((prev) => ({ ...prev, password: e.target.value }))}
                   required
                 />
+                <label className="flex items-center gap-2 text-sm text-secondary-700">
+                  <input
+                    type="checkbox"
+                    checked={newAccount.is_shared || false}
+                    onChange={(e) => setNewAccount((prev) => ({ ...prev, is_shared: e.target.checked }))}
+                    className="rounded"
+                  />
+                  Geteiltes Postfach (für alle Tenant-Benutzer sichtbar)
+                </label>
                 <div className="flex gap-2">
                   <Button onClick={handleCreateAccount} isLoading={saving} size="sm">{t('common.save')}</Button>
                   <Button variant="secondary" size="sm" onClick={() => setShowAddAccount(false)}>{t('common.cancel')}</Button>