diff --git a/src/components/users/modals/UserMenuModal.tsx b/src/components/users/modals/UserMenuModal.tsx
index 5c14c75..0624f3a 100644
--- a/src/components/users/modals/UserMenuModal.tsx
+++ b/src/components/users/modals/UserMenuModal.tsx
@@ -52,6 +52,7 @@ export default function UserMenuModal() {
         initialValues: {
             sn: user?.sn ?? "",
             givenName: user?.givenName ?? "",
+            muteEmailNotifications: user?.muteEmailNotifications ?? false
         },
         validate: {
             sn: isNotEmpty('Bitte gebe deinen Nachnamen ein'),
@@ -157,9 +158,9 @@ export default function UserMenuModal() {
                     </Text>
                 </div>
 
-                {(user?.memberOf?.length ?? 0) > 0 && <>
+                {user?.expand?.memberOf !== undefined && <>
                     <Title order={5}>Deine Gruppen</Title>
-                    <LdapGroupsDisplay groups={user?.expand?.memberOf}/>
+                    <LdapGroupsDisplay groups={user?.expand?.memberOf ?? []}/>
                 </>}
 
                 <Divider label={"Einstellungen"}/>
@@ -218,22 +219,29 @@ export default function UserMenuModal() {
                     </>
                 }
 
-                <Group justify={"center"}>
-                    {user?.REALM === "GUEST" && <>
-                        <Tooltip label={"Vor- und Nachname speichern"}>
-                            <ActionIcon
-                                variant={"transparent"}
-                                aria-label={"change email"}
-                                onClick={() => {
-                                    mutation.mutate()
-                                }}
-                                color={"green"}
-                                disabled={!formValues.isTouched()}
-                            >
-                                <IconDeviceFloppy/>
-                            </ActionIcon>
-                        </Tooltip>
+                <Switch
+                    label={"Email Benachrichtigungen stummschalten"}
+                    description={"Hier kannst du Email Benachrichtigungen für Gruppennachrichten stummschalten. " +
+                        "Du erhältst weiterhin Benachrichtigungen für Ankündigungen."}
+                    {...formValues.getInputProps("muteEmailNotifications")}
+                />
 
+                <Group justify={"center"}>
+                    <Tooltip label={"Account Einstellungen"}>
+                        <ActionIcon
+                            variant={"transparent"}
+                            aria-label={"update account"}
+                            onClick={() => {
+                                mutation.mutate()
+                            }}
+                            color={"green"}
+                            disabled={!formValues.isTouched()}
+                        >
+                            <IconDeviceFloppy/>
+                        </ActionIcon>
+                    </Tooltip>
+
+                    {user?.REALM === "GUEST" && <>
                         <Tooltip label={"Email ändern"}>
                             <ActionIcon
                                 variant={"transparent"}
diff --git a/src/models/AuthTypes.ts b/src/models/AuthTypes.ts
index b0b1f66..a900a9d 100644
--- a/src/models/AuthTypes.ts
+++ b/src/models/AuthTypes.ts
@@ -5,6 +5,10 @@ export type UserModal = {
     verified: boolean;
     email: string;
     emailVisibility: boolean;
+    muteEmailNotifications: boolean;
+
+    sn: string | null;
+    givenName: string | null;
 } & RecordModel & (GuestUser | LDAPUser)
 
 type GuestUser = {
@@ -12,8 +16,6 @@ type GuestUser = {
 
     cn: null;
     dn: null;
-    sn: null;
-    givenName: null;
     accountExpires: null;
     objectGUID: null;
     memberOf: [];
@@ -24,8 +26,7 @@ type LDAPUser = {
 
     cn: string;
     dn: string;
-    sn: string;
-    givenName: string;
+
     accountExpires: string | null;
     objectGUID: string;
     memberOf: string[];