diff --git a/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts b/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
index 7076328db4f1d82dce292373216147d833b0a0a8..bcfb314d76fcf50edc3941f35857b3e8150cc285 100644
--- a/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
+++ b/charts/opendesk-jitsi/files/jitsi-keycloak-adapter/context.ts
@@ -1,4 +1,5 @@
 // -----------------------------------------------------------------------------
+// SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 // SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 // SPDX-License-Identifier: Apache-2.0
 // -----------------------------------------------------------------------------
@@ -9,14 +10,18 @@
 // -----------------------------------------------------------------------------
 
 export function createContext(userInfo: Record<string, unknown>) {
-  const context = {
-    user: {
-      id: userInfo.sub,
-      name: userInfo.name || userInfo.preferred_username || "",
-      email: userInfo.email || "",
-      lobby_bypass: true,
-    },
-  };
-
-  return context;
+  if (userInfo.opendesk_username) {
+    const context = {
+      user: {
+        id: userInfo.sub,
+        name: userInfo.name || userInfo.opendesk_username || "",
+        email: userInfo.email || "",
+        lobby_bypass: true,
+      },
+    };
+    return context;
+  }
+  else {
+    return null;
+  }
 }