feat: allow team admins to invite members to their own teams (#6891)

Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>
2025-12-20 12:11:18 -06:00 · 2025-12-11 21:01:48 -08:00
parent 666a79044f
commit 2d7b99ba26
36 changed files with 588 additions and 217 deletions
--- a/apps/web/app/(app)/environments/[environmentId]/components/organization-breadcrumb.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/components/organization-breadcrumb.tsx
@@ -135,7 +135,7 @@ export const OrganizationBreadcrumb = ({
    },
    {
      id: "teams",
-      label: t("common.teams"),
+      label: t("common.members_and_teams"),
      href: `/environments/${currentEnvironmentId}/settings/teams`,
    },
    {
--- a/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar.tsx
@@ -36,7 +36,7 @@ export const OrganizationSettingsNavbar = ({
    },
    {
      id: "teams",
-      label: t("common.teams"),
+      label: t("common.members_and_teams"),
      href: `/environments/${environmentId}/settings/teams`,
      current: pathname?.includes("/teams"),
    },
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -234,6 +234,7 @@ checksums:
    common/maximum: 4c07541dd1f093775bdc61b559cca6c8
    common/member: 1606dc30b369856b9dba1fe9aec425d2
    common/members: 0932e80cba1e3e0a7f52bb67ff31da32
+    common/members_and_teams: bf5c3fadcb9fc23533ec1532b805ac08
    common/membership_not_found: 7ac63584af23396aace9992ad919ffd4
    common/metadata: 695d4f7da261ba76e3be4de495491028
    common/minimum: d9759235086d0169928b3c1401115e22
@@ -313,6 +314,7 @@ checksums:
    common/read_docs: 426ba960bfedf186a878b7467867f9d2
    common/recipients: f90e7f266be3f5a724858f21a9fd855e
    common/remove: dba2fe5fe9f83f8078c687f28cba4b52
+    common/remove_from_team: 69bcc7a1001c3017f9de578ee22cffd6
    common/reorder_and_hide_columns: a5e3d7c0c7ef879211d05a37be1c5069
    common/report_survey: 147dd05db52e35f5d1f837460fb720f5
    common/request_pricing: 58eb24af4f098632709cb7482b70a1cb
@@ -380,7 +382,8 @@ checksums:
    common/team_access: 45c6232c71b760eaa33b932dabab4c1c
    common/team_id: 134e32d6f7184577a46b2fd83e85e532
    common/team_name: 549d949de4b9adad4afd6427a60a329e
-    common/teams: a2fbdec69342366a2b6033d119aa279a
+    common/team_role: 66db395781aef64ef3791417b3b67c0b
+    common/teams: b63448c05270497973ac4407047dae02
    common/teams_not_found: 02f333a64a83c1c014d8900ec9666345
    common/text: 4ddccc1974775ed7357f9beaf9361cec
    common/time: b504a03d52e8001bfdc5cb6205364f42
@@ -840,7 +843,6 @@ checksums:
    environments/project/tags/tags_merged: 544471de666f93fbb0ab600321d1e553
    environments/project/teams/manage_teams: d7b5f26335cea450c333832adbe0b6ad
    environments/project/teams/no_teams_found: fb6680d4b5b73731697b100713afb50d
-    environments/project/teams/only_organization_owners_and_managers_can_manage_teams: 179056fade669d34f63fb1ee965b8024
    environments/project/teams/permission: cc2ed7274bd8267f9e0a10b079584d8b
    environments/project/teams/team_name: d1a5f99dbf503ca53f06b3a98b511d02
    environments/project/teams/team_settings_description: da32d77993f5c5c7547cdf3e1d3fc7d5
@@ -1086,13 +1088,17 @@ checksums:
    environments/settings/teams/manage_team: 4c52e636cfd1451a08179fb7a68042ab
    environments/settings/teams/manage_team_disabled: 2aaa0557b403a5bc657ec9e8b19ac5ac
    environments/settings/teams/manager_role_description: 39846863fa85ff8b1c6e4f354eb5018f
+    environments/settings/teams/member: 1606dc30b369856b9dba1fe9aec425d2
    environments/settings/teams/member_role_description: 1c5deaece65798b74cc0d34525506c18
    environments/settings/teams/member_role_info_message: 0a276eef3c3b907d6f396ebfdc693b12
+    environments/settings/teams/organization_role: 979b75fcc3696952e5922d659c839c10
    environments/settings/teams/owner_role_description: 8f577e6f9d1368fed4eba5a91ffc8cbf
    environments/settings/teams/please_fill_all_member_fields: 60e38d9906ec9a02a44d16c736bd9fe9
    environments/settings/teams/please_fill_all_project_fields: 6712059df63c432ecd31f3c52b8e4d87
    environments/settings/teams/read: 2494ca23d10e5b6381eb271aceeb5270
    environments/settings/teams/read_write: 278a90dade128198d4c93ac00c345320
+    environments/settings/teams/select_member: 7f4a38312aabbbe3fe92756b57bd5d75
+    environments/settings/teams/select_project: 6e4f4a24178660851d9ae0874706be9f
    environments/settings/teams/team_admin: 5df68214685738029af678ae1d5912bb
    environments/settings/teams/team_created_successfully: 45f83048fcabf466551144858a761eca
    environments/settings/teams/team_deleted_successfully: 972c86b0abe87f229f7bf1a691c0a253
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -261,6 +261,7 @@
    "maximum": "Maximal",
    "member": "Mitglied",
    "members": "Mitglieder",
+    "members_and_teams": "Mitglieder & Teams",
    "membership_not_found": "Mitgliedschaft nicht gefunden",
    "metadata": "Metadaten",
    "minimum": "Minimum",
@@ -340,6 +341,7 @@
    "read_docs": "Dokumentation lesen",
    "recipients": "Empfänger",
    "remove": "Entfernen",
+    "remove_from_team": "Aus Team entfernen",
    "reorder_and_hide_columns": "Spalten neu anordnen und ausblenden",
    "report_survey": "Umfrage melden",
    "request_pricing": "Preise anfragen",
@@ -407,7 +409,8 @@
    "team_access": "Teamzugriff",
    "team_id": "Team-ID",
    "team_name": "Teamname",
-    "teams": "Zugriffskontrolle",
+    "team_role": "Team-Rolle",
+    "teams": "Teams",
    "teams_not_found": "Teams nicht gefunden",
    "text": "Text",
    "time": "Zeit",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Teams verwalten",
        "no_teams_found": "Keine Teams gefunden",
-        "only_organization_owners_and_managers_can_manage_teams": "Nur Organisationsinhaber und -manager können Teams verwalten.",
        "permission": "Berechtigung",
        "team_name": "Teamname",
        "team_settings_description": "Teams und ihre Mitglieder können auf dieses Projekt und seine Umfragen zugreifen. Organisationsbesitzer und Manager können diesen Zugriff gewähren."
@@ -1167,13 +1169,17 @@
        "manage_team": "Team verwalten",
        "manage_team_disabled": "Nur Organisationsbesitzer, Manager und Team-Admins können Teams verwalten.",
        "manager_role_description": "Manager können auf alle Projekte zugreifen und Mitglieder hinzufügen und entfernen.",
+        "member": "Mitglied",
        "member_role_description": "Mitglieder können in ausgewählten Projekten arbeiten.",
        "member_role_info_message": "Um neuen Mitgliedern Zugriff auf ein Projekt zu geben, füge sie bitte unten einem Team hinzu. Mit Teams kannst du steuern, wer auf welches Projekt zugreifen kann.",
+        "organization_role": "Organisationsrolle",
        "owner_role_description": "Besitzer haben die volle Kontrolle über die Organisation.",
        "please_fill_all_member_fields": "Bitte fülle alle Felder aus, um ein neues Mitglied hinzuzufügen.",
        "please_fill_all_project_fields": "Bitte fülle alle Felder aus, um ein neues Projekt hinzuzufügen.",
        "read": "Lesen",
        "read_write": "Lesen & Schreiben",
+        "select_member": "Mitglied auswählen",
+        "select_project": "Projekt auswählen",
        "team_admin": "Team-Admin",
        "team_created_successfully": "Team erfolgreich erstellt.",
        "team_deleted_successfully": "Team erfolgreich gelöscht.",
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -261,6 +261,7 @@
    "maximum": "Maximum",
    "member": "Member",
    "members": "Members",
+    "members_and_teams": "Members & Teams",
    "membership_not_found": "Membership not found",
    "metadata": "Metadata",
    "minimum": "Minimum",
@@ -337,9 +338,10 @@
    "quota": "Quota",
    "quotas": "Quotas",
    "quotas_description": "Limit the amount of responses you receive from participants who meet certain criteria.",
-    "read_docs": "Read Docs",
+    "read_docs": "Read docs",
    "recipients": "Recipients",
    "remove": "Remove",
+    "remove_from_team": "Remove from team",
    "reorder_and_hide_columns": "Reorder and hide columns",
    "report_survey": "Report Survey",
    "request_pricing": "Request Pricing",
@@ -349,7 +351,6 @@
    "responses": "Responses",
    "restart": "Restart",
    "role": "Role",
-    "role_organization": "Role (Organization)",
    "saas": "SaaS",
    "sales": "Sales",
    "save": "Save",
@@ -407,7 +408,8 @@
    "team_access": "Team Access",
    "team_id": "Team ID",
    "team_name": "Team name",
-    "teams": "Access Control",
+    "team_role": "Team role",
+    "teams": "Teams",
    "teams_not_found": "Teams not found",
    "text": "Text",
    "time": "Time",
@@ -903,7 +905,6 @@
      "teams": {
        "manage_teams": "Manage teams",
        "no_teams_found": "No teams found",
-        "only_organization_owners_and_managers_can_manage_teams": "Only organization owners and managers can manage teams.",
        "permission": "Permission",
        "team_name": "Team Name",
        "team_settings_description": "See which teams can access this project."
@@ -1167,13 +1168,17 @@
        "manage_team": "Manage team",
        "manage_team_disabled": "Only organization owners, managers and team admins can manage teams.",
        "manager_role_description": "Managers can access all projects and add and remove members.",
+        "member": "Member",
        "member_role_description": "Members can work in selected projects.",
        "member_role_info_message": "To give new members access to a project, please add them to a Team below. With Teams you can manage who has access to which project.",
+        "organization_role": "Organization role",
        "owner_role_description": "Owners have full control over the organization.",
        "please_fill_all_member_fields": "Please fill all the fields to add a new member.",
        "please_fill_all_project_fields": "Please fill all the fields to add a new project.",
        "read": "Read",
        "read_write": "Read & Write",
+        "select_member": "Select member",
+        "select_project": "Select project",
        "team_admin": "Team Admin",
        "team_created_successfully": "Team created successfully.",
        "team_deleted_successfully": "Team deleted successfully.",
--- a/apps/web/locales/es-ES.json
+++ b/apps/web/locales/es-ES.json
@@ -261,6 +261,7 @@
    "maximum": "Máximo",
    "member": "Miembro",
    "members": "Miembros",
+    "members_and_teams": "Miembros y equipos",
    "membership_not_found": "Membresía no encontrada",
    "metadata": "Metadatos",
    "minimum": "Mínimo",
@@ -340,6 +341,7 @@
    "read_docs": "Leer documentación",
    "recipients": "Destinatarios",
    "remove": "Eliminar",
+    "remove_from_team": "Eliminar del equipo",
    "reorder_and_hide_columns": "Reordenar y ocultar columnas",
    "report_survey": "Reportar encuesta",
    "request_pricing": "Solicitar precios",
@@ -407,7 +409,8 @@
    "team_access": "Acceso de equipo",
    "team_id": "ID de equipo",
    "team_name": "Nombre del equipo",
-    "teams": "Control de acceso",
+    "team_role": "Rol del equipo",
+    "teams": "Equipos",
    "teams_not_found": "Equipos no encontrados",
    "text": "Texto",
    "time": "Hora",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Gestionar equipos",
        "no_teams_found": "No se han encontrado equipos",
-        "only_organization_owners_and_managers_can_manage_teams": "Solo los propietarios y gestores de la organización pueden gestionar equipos.",
        "permission": "Permiso",
        "team_name": "Nombre del equipo",
        "team_settings_description": "Consulta qué equipos pueden acceder a este proyecto."
@@ -1167,13 +1169,17 @@
        "manage_team": "Gestionar equipo",
        "manage_team_disabled": "Solo los propietarios de la organización, gestores y administradores de equipo pueden gestionar equipos.",
        "manager_role_description": "Los gestores pueden acceder a todos los proyectos y añadir y eliminar miembros.",
+        "member": "Miembro",
        "member_role_description": "Los miembros pueden trabajar en proyectos seleccionados.",
        "member_role_info_message": "Para dar a los nuevos miembros acceso a un proyecto, por favor añádelos a un equipo a continuación. Con los equipos puedes gestionar quién tiene acceso a qué proyecto.",
+        "organization_role": "Rol en la organización",
        "owner_role_description": "Los propietarios tienen control total sobre la organización.",
        "please_fill_all_member_fields": "Por favor, rellena todos los campos para añadir un nuevo miembro.",
        "please_fill_all_project_fields": "Por favor, rellena todos los campos para añadir un nuevo proyecto.",
        "read": "Lectura",
        "read_write": "Lectura y escritura",
+        "select_member": "Seleccionar miembro",
+        "select_project": "Seleccionar proyecto",
        "team_admin": "Administrador de equipo",
        "team_created_successfully": "Equipo creado con éxito.",
        "team_deleted_successfully": "Equipo eliminado correctamente.",
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -261,6 +261,7 @@
    "maximum": "Max",
    "member": "Membre",
    "members": "Membres",
+    "members_and_teams": "Membres & Équipes",
    "membership_not_found": "Abonnement non trouvé",
    "metadata": "Métadonnées",
    "minimum": "Min",
@@ -340,6 +341,7 @@
    "read_docs": "Lire les documents",
    "recipients": "Destinataires",
    "remove": "Retirer",
+    "remove_from_team": "Retirer de l'équipe",
    "reorder_and_hide_columns": "Réorganiser et masquer des colonnes",
    "report_survey": "Rapport d'enquête",
    "request_pricing": "Connaître le tarif",
@@ -407,7 +409,8 @@
    "team_access": "Accès",
    "team_id": "Identifiant de l'équipe",
    "team_name": "Nom de l'équipe",
-    "teams": "Contrôle d'accès",
+    "team_role": "Rôle dans l'équipe",
+    "teams": "Équipes",
    "teams_not_found": "Équipes non trouvées",
    "text": "Texte",
    "time": "Temps",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Gérer les équipes",
        "no_teams_found": "Aucune équipe trouvée",
-        "only_organization_owners_and_managers_can_manage_teams": "Seuls les propriétaires et les gestionnaires de l'organisation peuvent gérer les équipes.",
        "permission": "Permission",
        "team_name": "Nom de l'équipe",
        "team_settings_description": "Vous pouvez consulter la liste des équipes qui ont accès à ce projet."
@@ -1167,13 +1169,17 @@
        "manage_team": "Gérer l'équipe",
        "manage_team_disabled": "Seuls les propriétaires de l'organisation, les gestionnaires et les administrateurs d'équipe peuvent gérer les équipes.",
        "manager_role_description": "Les gestionnaires peuvent accéder à tous les projets et ajouter et supprimer des membres.",
+        "member": "Membre",
        "member_role_description": "Les membres peuvent travailler sur des projets sélectionnés.",
        "member_role_info_message": "Pour donner accès à un projet aux nouveaux membres, veuillez les ajouter à une équipe ci-dessous. Avec les équipes, vous pouvez gérer qui a accès à quel projet.",
+        "organization_role": "Rôle dans l'organisation",
        "owner_role_description": "Les propriétaires ont un contrôle total sur l'organisation.",
        "please_fill_all_member_fields": "Veuillez remplir tous les champs pour ajouter un nouveau membre.",
        "please_fill_all_project_fields": "Veuillez remplir tous les champs pour ajouter un nouveau projet.",
        "read": "Lire",
        "read_write": "Lire et Écrire",
+        "select_member": "Sélectionner membre",
+        "select_project": "Sélectionner projet",
        "team_admin": "Administrateur d'équipe",
        "team_created_successfully": "Équipe créée avec succès.",
        "team_deleted_successfully": "Équipe supprimée avec succès.",
--- a/apps/web/locales/ja-JP.json
+++ b/apps/web/locales/ja-JP.json
@@ -261,6 +261,7 @@
    "maximum": "最大",
    "member": "メンバー",
    "members": "メンバー",
+    "members_and_teams": "メンバー＆チーム",
    "membership_not_found": "メンバーシップが見つかりません",
    "metadata": "メタデータ",
    "minimum": "最小",
@@ -340,6 +341,7 @@
    "read_docs": "ドキュメントを読む",
    "recipients": "受信者",
    "remove": "削除",
+    "remove_from_team": "チームから削除",
    "reorder_and_hide_columns": "列の並び替えと非表示",
    "report_survey": "フォームを報告",
    "request_pricing": "料金を問い合わせる",
@@ -407,7 +409,8 @@
    "team_access": "チームアクセス",
    "team_id": "チームID",
    "team_name": "チーム名",
-    "teams": "アクセス制御",
+    "team_role": "チームの役割",
+    "teams": "チーム",
    "teams_not_found": "チームが見つかりません",
    "text": "テキスト",
    "time": "時間",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "チームを管理",
        "no_teams_found": "チームが見つかりません",
-        "only_organization_owners_and_managers_can_manage_teams": "組織のオーナーまたは管理者のみがチームを管理できます。",
        "permission": "権限",
        "team_name": "チーム名",
        "team_settings_description": "このプロジェクトにアクセスできるチームを確認します。"
@@ -1167,13 +1169,17 @@
        "manage_team": "チームを管理",
        "manage_team_disabled": "組織のオーナー、管理者、チーム管理者のみがチームを管理できます。",
        "manager_role_description": "管理者はすべてのプロジェクトにアクセスでき、メンバーを追加および削除できます。",
+        "member": "メンバー",
        "member_role_description": "メンバーは選択されたプロジェクトで作業できます。",
        "member_role_info_message": "新しいメンバーにプロジェクトへのアクセス権を付与するには、以下のチームに追加してください。チームを使用すると、誰がどのプロジェクトにアクセスできるかを管理できます。",
+        "organization_role": "組織の役割",
        "owner_role_description": "オーナーは組織を完全に制御できます。",
        "please_fill_all_member_fields": "新しいメンバーを追加するには、すべてのフィールドを記入してください。",
        "please_fill_all_project_fields": "新しいプロジェクトを追加するには、すべてのフィールドを記入してください。",
        "read": "読み取り",
        "read_write": "読み書き",
+        "select_member": "メンバーを選択",
+        "select_project": "プロジェクトを選択",
        "team_admin": "チーム管理者",
        "team_created_successfully": "チームを正常に作成しました。",
        "team_deleted_successfully": "チームを正常に削除しました。",
--- a/apps/web/locales/nl-NL.json
+++ b/apps/web/locales/nl-NL.json
@@ -261,6 +261,7 @@
    "maximum": "Maximaal",
    "member": "Lid",
    "members": "Leden",
+    "members_and_teams": "Leden & teams",
    "membership_not_found": "Lidmaatschap niet gevonden",
    "metadata": "Metagegevens",
    "minimum": "Minimum",
@@ -340,6 +341,7 @@
    "read_docs": "Lees Documenten",
    "recipients": "Ontvangers",
    "remove": "Verwijderen",
+    "remove_from_team": "Verwijderen uit team",
    "reorder_and_hide_columns": "Kolommen opnieuw rangschikken en verbergen",
    "report_survey": "Verslag enquête",
    "request_pricing": "Vraag prijzen aan",
@@ -407,7 +409,8 @@
    "team_access": "Teamtoegang",
    "team_id": "Team-ID",
    "team_name": "Teamnaam",
-    "teams": "Toegangscontrole",
+    "team_role": "Teamrol",
+    "teams": "Teams",
    "teams_not_found": "Teams niet gevonden",
    "text": "Tekst",
    "time": "Tijd",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Beheer teams",
        "no_teams_found": "Geen teams gevonden",
-        "only_organization_owners_and_managers_can_manage_teams": "Alleen eigenaren en managers van organisaties kunnen teams beheren.",
        "permission": "Toestemming",
        "team_name": "Teamnaam",
        "team_settings_description": "Bekijk welke teams toegang hebben tot dit project."
@@ -1167,13 +1169,17 @@
        "manage_team": "Beheer team",
        "manage_team_disabled": "Alleen organisatie-eigenaren, managers en teambeheerders kunnen teams beheren.",
        "manager_role_description": "Managers hebben toegang tot alle projecten en kunnen leden toevoegen en verwijderen.",
+        "member": "Lid",
        "member_role_description": "Leden kunnen in geselecteerde projecten werken.",
        "member_role_info_message": "Om nieuwe leden toegang te geven tot een project, voegt u ze hieronder toe aan een team. Met Teams kun je beheren wie toegang heeft tot welk project.",
+        "organization_role": "Organisatierol",
        "owner_role_description": "Eigenaars hebben volledige controle over de organisatie.",
        "please_fill_all_member_fields": "Vul alle velden in om een nieuw lid toe te voegen.",
        "please_fill_all_project_fields": "Vul alle velden in om een nieuw project toe te voegen.",
        "read": "Lezen",
        "read_write": "Lezen en schrijven",
+        "select_member": "Selecteer lid",
+        "select_project": "Selecteer project",
        "team_admin": "Teambeheerder",
        "team_created_successfully": "Team succesvol aangemaakt.",
        "team_deleted_successfully": "Team succesvol verwijderd.",
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -261,6 +261,7 @@
    "maximum": "Máximo",
    "member": "Membros",
    "members": "Membros",
+    "members_and_teams": "Membros e equipes",
    "membership_not_found": "Assinatura não encontrada",
    "metadata": "metadados",
    "minimum": "Mínimo",
@@ -340,6 +341,7 @@
    "read_docs": "Ler Documentação",
    "recipients": "Destinatários",
    "remove": "remover",
+    "remove_from_team": "Remover da equipe",
    "reorder_and_hide_columns": "Reordenar e ocultar colunas",
    "report_survey": "Relatório de Pesquisa",
    "request_pricing": "Solicitar Preços",
@@ -407,7 +409,8 @@
    "team_access": "Acesso da equipe",
    "team_id": "ID da Equipe",
    "team_name": "Nome da equipe",
-    "teams": "Controle de Acesso",
+    "team_role": "Função na equipe",
+    "teams": "Equipes",
    "teams_not_found": "Equipes não encontradas",
    "text": "Texto",
    "time": "tempo",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Gerenciar Equipes",
        "no_teams_found": "Nenhuma equipe encontrada",
-        "only_organization_owners_and_managers_can_manage_teams": "Apenas proprietários e gerentes da organização podem gerenciar equipes.",
        "permission": "Permissão",
        "team_name": "Nome da equipe",
        "team_settings_description": "As equipes e seus membros podem acessar este projeto e suas pesquisas. Proprietários e gerentes da organização podem conceder esse acesso."
@@ -1167,13 +1169,17 @@
        "manage_team": "Gerenciar equipe",
        "manage_team_disabled": "Apenas proprietários da organização, gerentes e administradores da equipe podem gerenciar equipes.",
        "manager_role_description": "Os gerentes podem acessar todos os projetos e adicionar e remover membros.",
+        "member": "Membro",
        "member_role_description": "Os membros podem trabalhar em projetos selecionados.",
        "member_role_info_message": "Para dar acesso a novos membros a um projeto, por favor, adicione-os a uma equipe abaixo. Com equipes, você pode gerenciar quem tem acesso a qual projeto.",
+        "organization_role": "Função na organização",
        "owner_role_description": "Os proprietários têm controle total sobre a organização.",
        "please_fill_all_member_fields": "Por favor, preencha todos os campos para adicionar um novo membro.",
        "please_fill_all_project_fields": "Por favor, preencha todos os campos para adicionar um novo projeto.",
        "read": "Leitura",
        "read_write": "Leitura & Escrita",
+        "select_member": "Selecionar membro",
+        "select_project": "Selecionar projeto",
        "team_admin": "Administrador da equipe",
        "team_created_successfully": "Equipe criada com sucesso.",
        "team_deleted_successfully": "Equipe excluída com sucesso.",
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -261,6 +261,7 @@
    "maximum": "Máximo",
    "member": "Membro",
    "members": "Membros",
+    "members_and_teams": "Membros e equipas",
    "membership_not_found": "Associação não encontrada",
    "metadata": "Metadados",
    "minimum": "Mínimo",
@@ -340,6 +341,7 @@
    "read_docs": "Ler Documentos",
    "recipients": "Destinatários",
    "remove": "Remover",
+    "remove_from_team": "Remover da equipa",
    "reorder_and_hide_columns": "Reordenar e ocultar colunas",
    "report_survey": "Relatório de Inquérito",
    "request_pricing": "Pedido de Preços",
@@ -407,7 +409,8 @@
    "team_access": "Acesso da Equipa",
    "team_id": "ID da Equipa",
    "team_name": "Nome da equipa",
-    "teams": "Controlo de Acesso",
+    "team_role": "Função na equipa",
+    "teams": "Equipas",
    "teams_not_found": "Equipas não encontradas",
    "text": "Texto",
    "time": "Tempo",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Gerir equipas",
        "no_teams_found": "Nenhuma equipa encontrada",
-        "only_organization_owners_and_managers_can_manage_teams": "Apenas os proprietários e gestores da organização podem gerir equipas.",
        "permission": "Permissão",
        "team_name": "Nome da Equipa",
        "team_settings_description": "Veja quais equipas podem aceder a este projeto."
@@ -1167,13 +1169,17 @@
        "manage_team": "Gerir equipa",
        "manage_team_disabled": "Apenas os proprietários da organização, gestores e administradores de equipa podem gerir equipas.",
        "manager_role_description": "Os gestores podem aceder a todos os projetos e adicionar e remover membros.",
+        "member": "Membro",
        "member_role_description": "Os membros podem trabalhar em projetos selecionados.",
        "member_role_info_message": "Adicione os membros que deseja a uma Equipa abaixo. Nesta secção, pode gerir quem tem acesso a cada projeto.",
+        "organization_role": "Função na organização",
        "owner_role_description": "Os proprietários têm controlo total sobre a organização.",
        "please_fill_all_member_fields": "Por favor, preencha todos os campos para adicionar um novo membro.",
        "please_fill_all_project_fields": "Por favor, preencha todos os campos para adicionar um novo projeto.",
        "read": "Ler",
        "read_write": "Ler e Escrever",
+        "select_member": "Selecionar membro",
+        "select_project": "Selecionar projeto",
        "team_admin": "Administrador da Equipa",
        "team_created_successfully": "Equipa criada com sucesso.",
        "team_deleted_successfully": "Equipa eliminada com sucesso.",
--- a/apps/web/locales/ro-RO.json
+++ b/apps/web/locales/ro-RO.json
@@ -261,6 +261,7 @@
    "maximum": "Maximum",
    "member": "Membru",
    "members": "Membri",
+    "members_and_teams": "Membri și echipe",
    "membership_not_found": "Apartenența nu a fost găsită",
    "metadata": "Metadate",
    "minimum": "Minim",
@@ -340,6 +341,7 @@
    "read_docs": "Citește documentația",
    "recipients": "Destinatari",
    "remove": "Șterge",
+    "remove_from_team": "Elimină din echipă",
    "reorder_and_hide_columns": "Reordonați și ascundeți coloanele",
    "report_survey": "Raportează chestionarul",
    "request_pricing": "Solicită Prețuri",
@@ -407,7 +409,8 @@
    "team_access": "Acces echipă",
    "team_id": "ID echipă",
    "team_name": "Nume echipă",
-    "teams": "Control acces",
+    "team_role": "Rol în echipă",
+    "teams": "Echipe",
    "teams_not_found": "Echipele nu au fost găsite",
    "text": "Text",
    "time": "Timp",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Gestionați echipele",
        "no_teams_found": "Nicio echipă găsită",
-        "only_organization_owners_and_managers_can_manage_teams": "Doar proprietarii de organizație și managerii pot gestiona echipele.",
        "permission": "Permisiune",
        "team_name": "Nume echipă",
        "team_settings_description": "Vezi care echipe pot accesa acest proiect."
@@ -1167,13 +1169,17 @@
        "manage_team": "Gestionați echipa",
        "manage_team_disabled": "Doar proprietarii de organizații, managerii și administratorii de echipă pot gestiona echipele.",
        "manager_role_description": "Managerii pot accesa toate proiectele și pot adăuga sau elimina membri.",
+        "member": "Membru",
        "member_role_description": "Membrii pot lucra în proiectele selectate.",
        "member_role_info_message": "Pentru a oferi membrilor noi acces la un proiect, vă rugăm să-i adăugați la o Echipă mai jos. Cu Echipe puteți gestiona cine are acces la ce proiect.",
+        "organization_role": "Rol în organizație",
        "owner_role_description": "Proprietarii au control total asupra organizației.",
        "please_fill_all_member_fields": "Vă rugăm să completați toate câmpurile pentru a adăuga un nou membru.",
        "please_fill_all_project_fields": "Vă rugăm să completați toate câmpurile pentru a adăuga un proiect nou.",
        "read": "Citește",
        "read_write": "Citire & Scriere",
+        "select_member": "Selectează membrul",
+        "select_project": "Selectează proiectul",
        "team_admin": "Administrator Echipe",
        "team_created_successfully": "Echipă creată cu succes",
        "team_deleted_successfully": "Echipă ștearsă cu succes.",
--- a/apps/web/locales/sv-SE.json
+++ b/apps/web/locales/sv-SE.json
@@ -261,6 +261,7 @@
    "maximum": "Maximum",
    "member": "Medlem",
    "members": "Medlemmar",
+    "members_and_teams": "Medlemmar och team",
    "membership_not_found": "Medlemskap hittades inte",
    "metadata": "Metadata",
    "minimum": "Minimum",
@@ -340,6 +341,7 @@
    "read_docs": "Läs dokumentation",
    "recipients": "Mottagare",
    "remove": "Ta bort",
+    "remove_from_team": "Ta bort från teamet",
    "reorder_and_hide_columns": "Ordna om och dölj kolumner",
    "report_survey": "Rapportera enkät",
    "request_pricing": "Begär prissättning",
@@ -407,6 +409,7 @@
    "team_access": "Teamåtkomst",
    "team_id": "Team-ID",
    "team_name": "Teamnamn",
+    "team_role": "Teamroll",
    "teams": "Åtkomstkontroll",
    "teams_not_found": "Team hittades inte",
    "text": "Text",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "Hantera team",
        "no_teams_found": "Inga team hittades",
-        "only_organization_owners_and_managers_can_manage_teams": "Endast organisationsägare och administratörer kan hantera team.",
        "permission": "Behörighet",
        "team_name": "Teamnamn",
        "team_settings_description": "Se vilka team som kan komma åt detta projekt."
@@ -1167,13 +1169,17 @@
        "manage_team": "Hantera team",
        "manage_team_disabled": "Endast organisationsägare, administratörer och teamadministratörer kan hantera team.",
        "manager_role_description": "Administratörer kan komma åt alla projekt och lägga till och ta bort medlemmar.",
+        "member": "Medlem",
        "member_role_description": "Medlemmar kan arbeta i valda projekt.",
        "member_role_info_message": "För att ge nya medlemmar åtkomst till ett projekt, vänligen lägg till dem i ett team nedan. Med team kan du hantera vem som har åtkomst till vilket projekt.",
+        "organization_role": "Organisationsroll",
        "owner_role_description": "Ägare har full kontroll över organisationen.",
        "please_fill_all_member_fields": "Vänligen fyll i alla fält för att lägga till en ny medlem.",
        "please_fill_all_project_fields": "Vänligen fyll i alla fält för att lägga till ett nytt projekt.",
        "read": "Läs",
        "read_write": "Läs och skriv",
+        "select_member": "Välj medlem",
+        "select_project": "Välj projekt",
        "team_admin": "Teamadministratör",
        "team_created_successfully": "Team skapat.",
        "team_deleted_successfully": "Team borttaget.",
--- a/apps/web/locales/zh-Hans-CN.json
+++ b/apps/web/locales/zh-Hans-CN.json
@@ -261,6 +261,7 @@
    "maximum": "最大值",
    "member": "成员",
    "members": "成员",
+    "members_and_teams": "成员和团队",
    "membership_not_found": "未找到会员资格",
    "metadata": "元数据",
    "minimum": "最低",
@@ -340,6 +341,7 @@
    "read_docs": "阅读 文档",
    "recipients": "收件人",
    "remove": "移除",
+    "remove_from_team": "从团队中移除",
    "reorder_and_hide_columns": "重新排序和隐藏列",
    "report_survey": "报告调查",
    "request_pricing": "请求 定价",
@@ -407,7 +409,8 @@
    "team_access": "团队 访问",
    "team_id": "团队 ID",
    "team_name": "团队 名称",
-    "teams": "访问控制",
+    "team_role": "团队角色",
+    "teams": "团队",
    "teams_not_found": "未找到 团队",
    "text": "文本",
    "time": "时间",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "管理 团队",
        "no_teams_found": "未找到 团队",
-        "only_organization_owners_and_managers_can_manage_teams": "只有 组织 拥有者 和 经理 可以 管理 团队。",
        "permission": "权限",
        "team_name": "团队名称",
        "team_settings_description": "查看 哪些 团队 可以 访问 该 项目。"
@@ -1167,13 +1169,17 @@
        "manage_team": "管理团队",
        "manage_team_disabled": "只有 组织 拥有者、经理 和 团队 管理员 可以 管理 团队。",
        "manager_role_description": "经理 可以 访问 所有 项目 并 添加 移除 成员。",
+        "member": "成员",
        "member_role_description": "成员 可以 在 选定 项目 中 工作。",
        "member_role_info_message": "要 给 新 成员 访问 项目 ，请 将 他们 添加 到 下方 的 团队 。通过 团队 你 可以 管理 谁 可以 访问 哪个 项目 。",
+        "organization_role": "组织角色",
        "owner_role_description": "所有者拥有对组织的完全控制权。",
        "please_fill_all_member_fields": "请 填写 所有 字段 以 添加 新 成员。",
        "please_fill_all_project_fields": "请 填写 所有 字段 以 添加 新 项目。",
        "read": "阅读",
        "read_write": "读 & 写",
+        "select_member": "选择成员",
+        "select_project": "选择项目",
        "team_admin": "团队管理员",
        "team_created_successfully": "团队 创建 成功",
        "team_deleted_successfully": "团队 删除 成功",
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -261,6 +261,7 @@
    "maximum": "最大值",
    "member": "成員",
    "members": "成員",
+    "members_and_teams": "成員與團隊",
    "membership_not_found": "找不到成員資格",
    "metadata": "元數據",
    "minimum": "最小值",
@@ -340,6 +341,7 @@
    "read_docs": "閱讀文件",
    "recipients": "收件者",
    "remove": "移除",
+    "remove_from_team": "從團隊中移除",
    "reorder_and_hide_columns": "重新排序和隱藏欄位",
    "report_survey": "報告問卷",
    "request_pricing": "請求定價",
@@ -407,7 +409,8 @@
    "team_access": "團隊存取權限",
    "team_id": "團隊 ID",
    "team_name": "團隊名稱",
-    "teams": "存取控制",
+    "team_role": "團隊角色",
+    "teams": "團隊",
    "teams_not_found": "找不到團隊",
    "text": "文字",
    "time": "時間",
@@ -903,7 +906,6 @@
      "teams": {
        "manage_teams": "管理團隊",
        "no_teams_found": "找不到團隊",
-        "only_organization_owners_and_managers_can_manage_teams": "只有組織擁有者和管理員才能管理團隊。",
        "permission": "權限",
        "team_name": "團隊名稱",
        "team_settings_description": "查看哪些團隊可以存取此專案。"
@@ -1167,13 +1169,17 @@
        "manage_team": "管理團隊",
        "manage_team_disabled": "只有組織擁有者、管理員和團隊管理員才能管理團隊。",
        "manager_role_description": "管理員可以存取所有專案，並新增和移除成員。",
+        "member": "成員",
        "member_role_description": "成員可以在選定的專案中工作。",
        "member_role_info_message": "若要授予新成員存取專案的權限，請將他們新增至下方的團隊。藉由團隊，您可以管理誰可以存取哪些專案。",
+        "organization_role": "組織角色",
        "owner_role_description": "擁有者對組織具有完全控制權。",
        "please_fill_all_member_fields": "請填寫所有欄位以新增新成員。",
        "please_fill_all_project_fields": "請填寫所有欄位以新增新專案。",
        "read": "讀取",
        "read_write": "讀取和寫入",
+        "select_member": "選擇成員",
+        "select_project": "選擇專案",
        "team_admin": "團隊管理員",
        "team_created_successfully": "團隊已成功建立。",
        "team_deleted_successfully": "團隊已成功刪除。",
--- a/apps/web/modules/auth/signup/lib/tests/team.test.ts
+++ b/apps/web/modules/auth/signup/lib/tests/team.test.ts
@@ -3,7 +3,7 @@ import { OrganizationRole } from "@prisma/client";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { CreateMembershipInvite } from "@/modules/auth/signup/types/invites";
-import { createTeamMembership } from "../team";
+import { createTeamMembership, getTeamProjectIds } from "../team";

 // Setup all mocks
 const setupMocks = () => {
@@ -31,6 +31,7 @@ const setupMocks = () => {
  vi.mock("@formbricks/logger", () => ({
    logger: {
      error: vi.fn(),
+      warn: vi.fn(),
    },
  }));

@@ -55,7 +56,7 @@ describe("Team Management", () => {
  describe("createTeamMembership", () => {
    describe("when user is an admin", () => {
      test("creates a team membership with admin role", async () => {
-        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM);
+        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM as unknown as any);
        vi.mocked(prisma.teamUser.create).mockResolvedValue(MOCK_TEAM_USER);

        await createTeamMembership(MOCK_INVITE, MOCK_IDS.userId);
@@ -90,7 +91,7 @@ describe("Team Management", () => {
          role: "member" as OrganizationRole,
        };

-        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM);
+        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM as unknown as any);
        vi.mocked(prisma.teamUser.create).mockResolvedValue({
          ...MOCK_TEAM_USER,
          role: "contributor",
@@ -110,11 +111,68 @@ describe("Team Management", () => {

    describe("error handling", () => {
      test("throws error when database operation fails", async () => {
-        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM);
+        vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM as unknown as any);
        vi.mocked(prisma.teamUser.create).mockRejectedValue(new Error("Database error"));

        await expect(createTeamMembership(MOCK_INVITE, MOCK_IDS.userId)).rejects.toThrow("Database error");
      });
    });
+
+    describe("when team does not exist", () => {
+      test("skips membership creation and continues to next team", async () => {
+        const inviteWithMultipleTeams: CreateMembershipInvite = {
+          ...MOCK_INVITE,
+          teamIds: ["non-existent-team", MOCK_IDS.teamId],
+        };
+
+        vi.mocked(prisma.team.findUnique)
+          .mockResolvedValueOnce(null)
+          .mockResolvedValueOnce(MOCK_TEAM as unknown as any);
+        vi.mocked(prisma.teamUser.create).mockResolvedValue(MOCK_TEAM_USER);
+
+        await createTeamMembership(inviteWithMultipleTeams, MOCK_IDS.userId);
+
+        expect(prisma.team.findUnique).toHaveBeenCalledTimes(2);
+        expect(prisma.teamUser.create).toHaveBeenCalledTimes(1);
+        expect(prisma.teamUser.create).toHaveBeenCalledWith({
+          data: {
+            teamId: MOCK_IDS.teamId,
+            userId: MOCK_IDS.userId,
+            role: "admin",
+          },
+        });
+      });
+    });
+  });
+
+  describe("getTeamProjectIds", () => {
+    test("returns team with projectTeams when team exists", async () => {
+      vi.mocked(prisma.team.findUnique).mockResolvedValue(MOCK_TEAM as unknown as any);
+
+      const result = await getTeamProjectIds(MOCK_IDS.teamId, MOCK_IDS.organizationId);
+
+      expect(result).toEqual(MOCK_TEAM);
+      expect(prisma.team.findUnique).toHaveBeenCalledWith({
+        where: {
+          id: MOCK_IDS.teamId,
+          organizationId: MOCK_IDS.organizationId,
+        },
+        select: {
+          projectTeams: {
+            select: {
+              projectId: true,
+            },
+          },
+        },
+      });
+    });
+
+    test("returns null when team does not exist", async () => {
+      vi.mocked(prisma.team.findUnique).mockResolvedValue(null);
+
+      const result = await getTeamProjectIds(MOCK_IDS.teamId, MOCK_IDS.organizationId);
+
+      expect(result).toBeNull();
+    });
  });
 });
--- a/apps/web/modules/auth/signup/lib/team.ts
+++ b/apps/web/modules/auth/signup/lib/team.ts
@@ -18,15 +18,18 @@ export const createTeamMembership = async (invite: CreateMembershipInvite, userI
    for (const teamId of teamIds) {
      const team = await getTeamProjectIds(teamId, invite.organizationId);

-      if (team) {
-        await prisma.teamUser.create({
-          data: {
-            teamId,
-            userId,
-            role: isOwnerOrManager ? "admin" : "contributor",
-          },
-        });
+      if (!team) {
+        logger.warn({ teamId, userId }, "Team no longer exists during invite acceptance");
+        continue;
      }
+
+      await prisma.teamUser.create({
+        data: {
+          teamId,
+          userId,
+          role: isOwnerOrManager ? "admin" : "contributor",
+        },
+      });
    }
  } catch (error) {
    logger.error(error, `Error creating team membership ${invite.organizationId} ${userId}`);
@@ -39,7 +42,10 @@ export const createTeamMembership = async (invite: CreateMembershipInvite, userI
 };

 export const getTeamProjectIds = reactCache(
-  async (teamId: string, organizationId: string): Promise<{ projectTeams: { projectId: string }[] }> => {
+  async (
+    teamId: string,
+    organizationId: string
+  ): Promise<{ projectTeams: { projectId: string }[] } | null> => {
    const team = await prisma.team.findUnique({
      where: {
        id: teamId,
@@ -55,7 +61,7 @@ export const getTeamProjectIds = reactCache(
    });

    if (!team) {
-      throw new Error("Team not found");
+      return null;
    }

    return team;
--- a/apps/web/modules/ee/role-management/components/add-member-role.tsx
+++ b/apps/web/modules/ee/role-management/components/add-member-role.tsx
@@ -60,7 +60,7 @@ export function AddMemberRole({
      name="role"
      render={({ field: { onChange, value } }) => (
        <div className="flex flex-col space-y-2">
-          <Label>{t("common.role_organization")}</Label>
+          <Label>{t("environments.settings.teams.organization_role")}</Label>
          <Select
            defaultValue={isAccessControlAllowed ? "member" : "owner"}
            disabled={!isAccessControlAllowed}
--- a/apps/web/modules/ee/teams/lib/roles.test.ts
+++ b/apps/web/modules/ee/teams/lib/roles.test.ts
@@ -4,12 +4,12 @@ import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
 import { DatabaseError, UnknownError } from "@formbricks/types/errors";
 import { validateInputs } from "@/lib/utils/validate";
-import { getProjectPermissionByUserId, getTeamRoleByTeamIdUserId } from "./roles";
+import { getProjectPermissionByUserId, getTeamRoleByTeamIdUserId, getTeamsWhereUserIsAdmin } from "./roles";

 vi.mock("@formbricks/database", () => ({
  prisma: {
    projectTeam: { findMany: vi.fn() },
-    teamUser: { findUnique: vi.fn() },
+    teamUser: { findUnique: vi.fn(), findMany: vi.fn() },
  },
 }));

@@ -19,6 +19,7 @@ vi.mock("@/lib/utils/validate", () => ({ validateInputs: vi.fn() }));
 const mockUserId = "user-1";
 const mockProjectId = "project-1";
 const mockTeamId = "team-1";
+const mockOrganizationId = "org-1";

 describe("roles lib", () => {
  beforeEach(() => {
@@ -90,7 +91,7 @@ describe("roles lib", () => {
    });

    test("returns role if teamUser exists", async () => {
-      vi.mocked(prisma.teamUser.findUnique).mockResolvedValueOnce({ role: "member" });
+      vi.mocked(prisma.teamUser.findUnique).mockResolvedValueOnce({ role: "member" } as unknown as any);
      const result = await getTeamRoleByTeamIdUserId(mockTeamId, mockUserId);
      expect(result).toBe("member");
    });
@@ -110,4 +111,47 @@ describe("roles lib", () => {
      await expect(getTeamRoleByTeamIdUserId(mockTeamId, mockUserId)).rejects.toThrow(error);
    });
  });
+
+  describe("getTeamsWhereUserIsAdmin", () => {
+    test("returns empty array if user is not admin of any team", async () => {
+      vi.mocked(prisma.teamUser.findMany).mockResolvedValueOnce([]);
+      const result = await getTeamsWhereUserIsAdmin(mockUserId, mockOrganizationId);
+      expect(result).toEqual([]);
+      expect(validateInputs).toHaveBeenCalledWith(
+        [mockUserId, expect.anything()],
+        [mockOrganizationId, expect.anything()]
+      );
+    });
+
+    test("returns array of team IDs where user is admin", async () => {
+      vi.mocked(prisma.teamUser.findMany).mockResolvedValueOnce([
+        { teamId: "team-1" },
+        { teamId: "team-2" },
+        { teamId: "team-3" },
+      ] as unknown as any);
+      const result = await getTeamsWhereUserIsAdmin(mockUserId, mockOrganizationId);
+      expect(result).toEqual(["team-1", "team-2", "team-3"]);
+    });
+
+    test("returns single team ID when user is admin of one team", async () => {
+      vi.mocked(prisma.teamUser.findMany).mockResolvedValueOnce([{ teamId: "team-1" }] as unknown as any);
+      const result = await getTeamsWhereUserIsAdmin(mockUserId, mockOrganizationId);
+      expect(result).toEqual(["team-1"]);
+    });
+
+    test("throws DatabaseError on PrismaClientKnownRequestError", async () => {
+      const error = new Prisma.PrismaClientKnownRequestError("fail", {
+        code: "P2002",
+        clientVersion: "1.0.0",
+      });
+      vi.mocked(prisma.teamUser.findMany).mockRejectedValueOnce(error);
+      await expect(getTeamsWhereUserIsAdmin(mockUserId, mockOrganizationId)).rejects.toThrow(DatabaseError);
+    });
+
+    test("throws error on generic error", async () => {
+      const error = new Error("fail");
+      vi.mocked(prisma.teamUser.findMany).mockRejectedValueOnce(error);
+      await expect(getTeamsWhereUserIsAdmin(mockUserId, mockOrganizationId)).rejects.toThrow(error);
+    });
+  });
 });
--- a/apps/web/modules/ee/teams/lib/roles.ts
+++ b/apps/web/modules/ee/teams/lib/roles.ts
@@ -83,3 +83,31 @@ export const getTeamRoleByTeamIdUserId = reactCache(
    }
  }
 );
+
+export const getTeamsWhereUserIsAdmin = reactCache(
+  async (userId: string, organizationId: string): Promise<string[]> => {
+    validateInputs([userId, ZId], [organizationId, ZId]);
+    try {
+      const adminTeams = await prisma.teamUser.findMany({
+        where: {
+          userId,
+          role: "admin",
+          team: {
+            organizationId,
+          },
+        },
+        select: {
+          teamId: true,
+        },
+      });
+
+      return adminTeams.map((at) => at.teamId);
+    } catch (error) {
+      if (error instanceof Prisma.PrismaClientKnownRequestError) {
+        throw new DatabaseError(error.message);
+      }
+
+      throw error;
+    }
+  }
+);
--- a/apps/web/modules/ee/teams/project-teams/components/access-table.tsx
+++ b/apps/web/modules/ee/teams/project-teams/components/access-table.tsx
@@ -43,7 +43,7 @@ export const AccessTable = ({ teams }: AccessTableProps) => {
                {team.memberCount} {team.memberCount === 1 ? t("common.member") : t("common.members")}
              </TableCell>
              <TableCell>
-                <IdBadge id={team.id} showCopyIconOnHover={true} />
+                <IdBadge id={team.id} />
              </TableCell>
              <TableCell>
                <p className="capitalize">{TeamPermissionMapping[team.permission]}</p>
--- a/apps/web/modules/ee/teams/project-teams/components/access-view.tsx
+++ b/apps/web/modules/ee/teams/project-teams/components/access-view.tsx
@@ -9,10 +9,9 @@ import { TProjectTeam } from "@/modules/ee/teams/project-teams/types/team";
 interface AccessViewProps {
  teams: TProjectTeam[];
  environmentId: string;
-  isOwnerOrManager: boolean;
 }

-export const AccessView = ({ teams, environmentId, isOwnerOrManager }: AccessViewProps) => {
+export const AccessView = ({ teams, environmentId }: AccessViewProps) => {
  const { t } = useTranslation();
  return (
    <>
@@ -20,7 +19,7 @@ export const AccessView = ({ teams, environmentId, isOwnerOrManager }: AccessVie
        title={t("common.team_access")}
        description={t("environments.project.teams.team_settings_description")}>
        <div className="mb-4 flex justify-end">
-          <ManageTeam environmentId={environmentId} isOwnerOrManager={isOwnerOrManager} />
+          <ManageTeam environmentId={environmentId} />
        </div>
        <AccessTable teams={teams} />
      </SettingsCard>
--- a/apps/web/modules/ee/teams/project-teams/components/manage-team.tsx
+++ b/apps/web/modules/ee/teams/project-teams/components/manage-team.tsx
@@ -3,14 +3,12 @@
 import { useRouter } from "next/navigation";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/modules/ui/components/button";
-import { TooltipRenderer } from "@/modules/ui/components/tooltip";

 interface ManageTeamProps {
  environmentId: string;
-  isOwnerOrManager: boolean;
 }

-export const ManageTeam = ({ environmentId, isOwnerOrManager }: ManageTeamProps) => {
+export const ManageTeam = ({ environmentId }: ManageTeamProps) => {
  const { t } = useTranslation();

  const router = useRouter();
@@ -19,20 +17,9 @@ export const ManageTeam = ({ environmentId, isOwnerOrManager }: ManageTeamProps)
    router.push(`/environments/${environmentId}/settings/teams`);
  };

-  if (isOwnerOrManager) {
-    return (
-      <Button variant="secondary" size="sm" onClick={handleManageTeams}>
-        {t("environments.project.teams.manage_teams")}
-      </Button>
-    );
-  }
-
  return (
-    <TooltipRenderer
-      tooltipContent={t("environments.project.teams.only_organization_owners_and_managers_can_manage_teams")}>
-      <Button variant="secondary" size="sm" disabled>
-        {t("environments.project.teams.manage_teams")}
-      </Button>
-    </TooltipRenderer>
+    <Button variant="secondary" size="sm" onClick={handleManageTeams}>
+      {t("environments.project.teams.manage_teams")}
+    </Button>
  );
 };
--- a/apps/web/modules/ee/teams/project-teams/page.tsx
+++ b/apps/web/modules/ee/teams/project-teams/page.tsx
@@ -10,7 +10,7 @@ export const ProjectTeams = async (props: { params: Promise<{ environmentId: str
  const t = await getTranslate();
  const params = await props.params;

-  const { project, isOwner, isManager } = await getEnvironmentAuth(params.environmentId);
+  const { project } = await getEnvironmentAuth(params.environmentId);

  const teams = await getTeamsByProjectId(project.id);

@@ -18,14 +18,12 @@ export const ProjectTeams = async (props: { params: Promise<{ environmentId: str
    throw new Error(t("common.teams_not_found"));
  }

-  const isOwnerOrManager = isOwner || isManager;
-
  return (
    <PageContentWrapper>
      <PageHeader pageTitle={t("common.project_configuration")}>
        <ProjectConfigNavigation environmentId={params.environmentId} activeId="teams" />
      </PageHeader>
-      <AccessView environmentId={params.environmentId} teams={teams} isOwnerOrManager={isOwnerOrManager} />
+      <AccessView environmentId={params.environmentId} teams={teams} />
    </PageContentWrapper>
  );
 };
--- a/apps/web/modules/ee/teams/team-list/components/team-settings/team-settings-modal.tsx
+++ b/apps/web/modules/ee/teams/team-list/components/team-settings/team-settings-modal.tsx
@@ -1,7 +1,7 @@
 "use client";

 import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon, Trash2Icon } from "lucide-react";
+import { PlusIcon, Trash2Icon, XIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useMemo } from "react";
 import { FormProvider, SubmitHandler, useForm, useWatch } from "react-hook-form";
@@ -80,6 +80,16 @@ export const TeamSettingsModal = ({

  const router = useRouter();

+  // Track initial member IDs to distinguish existing members from newly added ones
+  const initialMemberIds = useMemo(() => {
+    return new Set(team.members.map((member) => member.userId));
+  }, [team.members]);
+
+  // Track initial project IDs to distinguish existing projects from newly added ones
+  const initialProjectIds = useMemo(() => {
+    return new Set(team.projects.map((project) => project.projectId));
+  }, [team.projects]);
+
  const initialMembers = useMemo(() => {
    const members = team.members.map((member) => ({
      userId: member.userId,
@@ -259,34 +269,44 @@ export const TeamSettingsModal = ({
                              <FormField
                                control={control}
                                name={`members.${index}.userId`}
-                                render={({ field, fieldState: { error } }) => (
-                                  <FormItem className="flex-1">
-                                    <Select
-                                      onValueChange={(val) => {
-                                        field.onChange(val);
-                                        handleMemberSelectionChange(index, val);
-                                      }}
-                                      disabled={!isOwnerOrManager && !isTeamAdminMember}
-                                      value={member.userId}>
-                                      <SelectTrigger>
-                                        <SelectValue placeholder="Select member" />
-                                      </SelectTrigger>
-                                      <SelectContent>
-                                        {memberOpts.map((option) => (
-                                          <SelectItem
-                                            key={option.value}
-                                            value={option.value}
-                                            id={`member-${index}-option`}>
-                                            {option.label}
-                                          </SelectItem>
-                                        ))}
-                                      </SelectContent>
-                                    </Select>
-                                    {error?.message && (
-                                      <FormError className="text-left">{error.message}</FormError>
-                                    )}
-                                  </FormItem>
-                                )}
+                                render={({ field, fieldState: { error } }) => {
+                                  // Disable user select for existing members (can only remove or change role)
+                                  const isExistingMember =
+                                    member.userId && initialMemberIds.has(member.userId);
+                                  const isSelectDisabled =
+                                    isExistingMember || (!isOwnerOrManager && !isTeamAdminMember);
+
+                                  return (
+                                    <FormItem className="flex-1">
+                                      <Select
+                                        onValueChange={(val) => {
+                                          field.onChange(val);
+                                          handleMemberSelectionChange(index, val);
+                                        }}
+                                        disabled={isSelectDisabled}
+                                        value={member.userId}>
+                                        <SelectTrigger>
+                                          <SelectValue
+                                            placeholder={t("environments.settings.teams.select_member")}
+                                          />
+                                        </SelectTrigger>
+                                        <SelectContent>
+                                          {memberOpts.map((option) => (
+                                            <SelectItem
+                                              key={option.value}
+                                              value={option.value}
+                                              id={`member-${index}-option`}>
+                                              {option.label}
+                                            </SelectItem>
+                                          ))}
+                                        </SelectContent>
+                                      </Select>
+                                      {error?.message && (
+                                        <FormError className="text-left">{error.message}</FormError>
+                                      )}
+                                    </FormItem>
+                                  );
+                                }}
                              />

                              <FormField
@@ -328,18 +348,20 @@ export const TeamSettingsModal = ({

                              {/* Delete Button for Member */}
                              {watchMembers.length > 1 && (
-                                <Button
-                                  size="icon"
-                                  type="button"
-                                  variant="secondary"
-                                  className="shrink-0"
-                                  disabled={
-                                    !isOwnerOrManager &&
-                                    (!isTeamAdminMember || member.userId === currentUserId)
-                                  }
-                                  onClick={() => handleRemoveMember(index)}>
-                                  <Trash2Icon className="h-4 w-4" />
-                                </Button>
+                                <TooltipRenderer tooltipContent={t("common.remove_from_team")}>
+                                  <Button
+                                    size="icon"
+                                    type="button"
+                                    variant="destructive"
+                                    className="shrink-0"
+                                    disabled={
+                                      !isOwnerOrManager &&
+                                      (!isTeamAdminMember || member.userId === currentUserId)
+                                    }
+                                    onClick={() => handleRemoveMember(index)}>
+                                    <XIcon className="h-4 w-4" />
+                                  </Button>
+                                </TooltipRenderer>
                              )}
                            </div>
                          );
@@ -360,7 +382,7 @@ export const TeamSettingsModal = ({
                      : t("environments.settings.teams.all_members_added")
                  }>
                  <Button
-                    size="default"
+                    size="sm"
                    type="button"
                    variant="secondary"
                    onClick={handleAddMember}
@@ -396,31 +418,40 @@ export const TeamSettingsModal = ({
                              <FormField
                                control={control}
                                name={`projects.${index}.projectId`}
-                                render={({ field, fieldState: { error } }) => (
-                                  <FormItem className="flex-1">
-                                    <Select
-                                      onValueChange={field.onChange}
-                                      value={project.projectId}
-                                      disabled={!isOwnerOrManager}>
-                                      <SelectTrigger>
-                                        <SelectValue placeholder="Select project" />
-                                      </SelectTrigger>
-                                      <SelectContent>
-                                        {projectOpts.map((option) => (
-                                          <SelectItem
-                                            key={option.value}
-                                            value={option.value}
-                                            id={`project-${index}-option`}>
-                                            {option.label}
-                                          </SelectItem>
-                                        ))}
-                                      </SelectContent>
-                                    </Select>
-                                    {error?.message && (
-                                      <FormError className="text-left">{error.message}</FormError>
-                                    )}
-                                  </FormItem>
-                                )}
+                                render={({ field, fieldState: { error } }) => {
+                                  // Disable project select for existing projects (can only remove or change permission)
+                                  const isExistingProject =
+                                    project.projectId && initialProjectIds.has(project.projectId);
+                                  const isSelectDisabled = isExistingProject || !isOwnerOrManager;
+
+                                  return (
+                                    <FormItem className="flex-1">
+                                      <Select
+                                        onValueChange={field.onChange}
+                                        value={project.projectId}
+                                        disabled={isSelectDisabled}>
+                                        <SelectTrigger>
+                                          <SelectValue
+                                            placeholder={t("environments.settings.teams.select_project")}
+                                          />
+                                        </SelectTrigger>
+                                        <SelectContent>
+                                          {projectOpts.map((option) => (
+                                            <SelectItem
+                                              key={option.value}
+                                              value={option.value}
+                                              id={`project-${index}-option`}>
+                                              {option.label}
+                                            </SelectItem>
+                                          ))}
+                                        </SelectContent>
+                                      </Select>
+                                      {error?.message && (
+                                        <FormError className="text-left">{error.message}</FormError>
+                                      )}
+                                    </FormItem>
+                                  );
+                                }}
                              />

                              <FormField
@@ -481,7 +512,7 @@ export const TeamSettingsModal = ({
                      : t("environments.settings.teams.all_projects_added")
                  }>
                  <Button
-                    size="default"
+                    size="sm"
                    type="button"
                    variant="secondary"
                    onClick={handleAddProject}
--- a/apps/web/modules/organization/settings/teams/actions.ts
+++ b/apps/web/modules/organization/settings/teams/actions.ts
@@ -4,7 +4,7 @@ import { OrganizationRole } from "@prisma/client";
 import { z } from "zod";
 import { ZId, ZUuid } from "@formbricks/types/common";
 import { AuthenticationError, OperationNotAllowedError, ValidationError } from "@formbricks/types/errors";
-import { ZOrganizationRole } from "@formbricks/types/memberships";
+import { TOrganizationRole, ZOrganizationRole } from "@formbricks/types/memberships";
 import { INVITE_DISABLED, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { createInviteToken } from "@/lib/jwt";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
@@ -16,6 +16,7 @@ import { getOrganizationIdFromInviteId } from "@/lib/utils/helper";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
 import { checkRoleManagementPermission } from "@/modules/ee/role-management/actions";
+import { getTeamsWhereUserIsAdmin } from "@/modules/ee/teams/lib/roles";
 import { sendInviteMemberEmail } from "@/modules/email";
 import {
  deleteMembership,
@@ -195,19 +196,55 @@ export const resendInviteAction = authenticatedActionClient.schema(ZResendInvite
  )
 );

+const validateTeamAdminInvitePermissions = (
+  inviterRole: TOrganizationRole,
+  inviterAdminTeams: string[],
+  inviteRole: TOrganizationRole,
+  inviteTeamIds: string[]
+): void => {
+  const isOrgOwnerOrManager = inviterRole === "owner" || inviterRole === "manager";
+  const isTeamAdmin = inviterAdminTeams.length > 0;
+
+  if (!isOrgOwnerOrManager && !isTeamAdmin) {
+    throw new AuthenticationError("Only organization owners, managers, or team admins can invite members");
+  }
+
+  // Team admins have restrictions
+  if (isTeamAdmin && !isOrgOwnerOrManager) {
+    if (inviteRole !== "member") {
+      throw new OperationNotAllowedError("Team admins can only invite users as members");
+    }
+
+    const invalidTeams = inviteTeamIds.filter((id) => !inviterAdminTeams.includes(id));
+    if (invalidTeams.length > 0) {
+      throw new OperationNotAllowedError("Team admins can only add users to teams where they are admin");
+    }
+
+    if (inviteTeamIds.length === 0) {
+      throw new ValidationError("Team admins must add invited users to at least one team");
+    }
+  }
+};
+
 const ZInviteUserAction = z.object({
  organizationId: ZId,
  email: z.string(),
-  name: z.string(),
+  name: z.string().trim().min(1, "Name is required"),
  role: ZOrganizationRole,
-  teamIds: z.array(z.string()),
+  teamIds: z.array(ZId),
 });

 export const inviteUserAction = authenticatedActionClient.schema(ZInviteUserAction).action(
  withAuditLogging(
    "created",
    "invite",
-    async ({ ctx, parsedInput }: { ctx: AuthenticatedActionClientCtx; parsedInput: Record<string, any> }) => {
+    async ({
+      ctx,
+      parsedInput,
+    }: {
+      ctx: AuthenticatedActionClientCtx;
+      parsedInput: z.infer<typeof ZInviteUserAction>;
+    }) => {
      if (INVITE_DISABLED) {
        throw new AuthenticationError("Invite disabled");
      }
@@ -224,16 +261,41 @@ export const inviteUserAction = authenticatedActionClient.schema(ZInviteUserActi
        throw new AuthenticationError("User not a member of this organization");
      }

-      await checkAuthorizationUpdated({
-        userId: ctx.user.id,
-        organizationId: parsedInput.organizationId,
-        access: [
-          {
-            type: "organization",
-            roles: ["owner", "manager"],
-          },
-        ],
-      });
+      const isOrgOwnerOrManager =
+        currentUserMembership.role === "owner" || currentUserMembership.role === "manager";
+
+      // Fetch user's admin teams (empty array if owner/manager to skip unnecessary query)
+      const userAdminTeams = isOrgOwnerOrManager
+        ? []
+        : await getTeamsWhereUserIsAdmin(ctx.user.id, parsedInput.organizationId);
+
+      const isTeamAdmin = userAdminTeams.length > 0;
+
+      if (!isOrgOwnerOrManager && !isTeamAdmin) {
+        throw new AuthenticationError("Not authorized to invite members");
+      }
+
+      if (isOrgOwnerOrManager) {
+        // Standard org-level auth check
+        await checkAuthorizationUpdated({
+          userId: ctx.user.id,
+          organizationId: parsedInput.organizationId,
+          access: [
+            {
+              type: "organization",
+              roles: ["owner", "manager"],
+            },
+          ],
+        });
+      }
+
+      // Validate team admin restrictions
+      validateTeamAdminInvitePermissions(
+        currentUserMembership.role,
+        userAdminTeams,
+        parsedInput.role,
+        parsedInput.teamIds
+      );

      if (currentUserMembership.role === "manager" && parsedInput.role !== "member") {
        throw new OperationNotAllowedError("Managers can only invite users as members");
--- a/apps/web/modules/organization/settings/teams/components/edit-memberships/organization-actions.tsx
+++ b/apps/web/modules/organization/settings/teams/components/edit-memberships/organization-actions.tsx
@@ -37,6 +37,8 @@ interface OrganizationActionsProps {
  isMultiOrgEnabled: boolean;
  isUserManagementDisabledFromUi: boolean;
  isStorageConfigured: boolean;
+  isTeamAdmin: boolean;
+  userAdminTeamIds?: string[];
 }

 export const OrganizationActions = ({
@@ -52,16 +54,20 @@ export const OrganizationActions = ({
  isMultiOrgEnabled,
  isUserManagementDisabledFromUi,
  isStorageConfigured,
+  isTeamAdmin,
+  userAdminTeamIds,
 }: OrganizationActionsProps) => {
  const router = useRouter();
  const { t } = useTranslation();
-  const [isLeaveOrganizationModalOpen, setLeaveOrganizationModalOpen] = useState(false);
-  const [isInviteMemberModalOpen, setInviteMemberModalOpen] = useState(false);
+  const [isLeaveOrganizationModalOpen, setIsLeaveOrganizationModalOpen] = useState(false);
+  const [isInviteMemberModalOpen, setIsInviteMemberModalOpen] = useState(false);
  const [loading, setLoading] = useState(false);

  const { isOwner, isManager } = getAccessFlags(membershipRole);
  const isOwnerOrManager = isOwner || isManager;

+  const canInvite = isOwnerOrManager || (isAccessControlAllowed && isTeamAdmin);
+
  const handleLeaveOrganization = async () => {
    setLoading(true);
    try {
@@ -134,18 +140,18 @@ export const OrganizationActions = ({
    <>
      <div className="mb-4 flex justify-end space-x-2 text-right">
        {role !== "owner" && isMultiOrgEnabled && (
-          <Button variant="secondary" size="sm" onClick={() => setLeaveOrganizationModalOpen(true)}>
+          <Button variant="destructive" size="sm" onClick={() => setIsLeaveOrganizationModalOpen(true)}>
            {t("environments.settings.general.leave_organization")}
            <XIcon />
          </Button>
        )}

-        {!isInviteDisabled && isOwnerOrManager && !isUserManagementDisabledFromUi && (
+        {!isInviteDisabled && canInvite && !isUserManagementDisabledFromUi && (
          <Button
            size="sm"
-            variant="secondary"
+            variant="default"
            onClick={() => {
-              setInviteMemberModalOpen(true);
+              setIsInviteMemberModalOpen(true);
            }}>
            {t("environments.settings.teams.invite_member")}
          </Button>
@@ -153,7 +159,7 @@ export const OrganizationActions = ({
      </div>
      <InviteMemberModal
        open={isInviteMemberModalOpen}
-        setOpen={setInviteMemberModalOpen}
+        setOpen={setIsInviteMemberModalOpen}
        onSubmit={handleAddMembers}
        membershipRole={membershipRole}
        isAccessControlAllowed={isAccessControlAllowed}
@@ -161,9 +167,12 @@ export const OrganizationActions = ({
        environmentId={environmentId}
        teams={teams}
        isStorageConfigured={isStorageConfigured}
+        isOwnerOrManager={isOwnerOrManager}
+        isTeamAdmin={isTeamAdmin}
+        userAdminTeamIds={userAdminTeamIds}
      />

-      <Dialog open={isLeaveOrganizationModalOpen} onOpenChange={setLeaveOrganizationModalOpen}>
+      <Dialog open={isLeaveOrganizationModalOpen} onOpenChange={setIsLeaveOrganizationModalOpen}>
        <DialogContent>
          <DialogHeader>
            <DialogTitle>{t("environments.settings.general.leave_organization_title")}</DialogTitle>
@@ -177,7 +186,7 @@ export const OrganizationActions = ({
            </p>
          )}
          <DialogFooter>
-            <Button variant="secondary" onClick={() => setLeaveOrganizationModalOpen(false)}>
+            <Button variant="secondary" onClick={() => setIsLeaveOrganizationModalOpen(false)}>
              {t("common.cancel")}
            </Button>
            <Button
--- a/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx
+++ b/apps/web/modules/organization/settings/teams/components/invite-member/individual-invite-tab.tsx
@@ -7,13 +7,14 @@ import { useRouter } from "next/navigation";
 import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
+import { ZId } from "@formbricks/types/common";
 import { TOrganizationRole, ZOrganizationRole } from "@formbricks/types/memberships";
 import { ZUserName } from "@formbricks/types/user";
 import { AddMemberRole } from "@/modules/ee/role-management/components/add-member-role";
 import { TOrganizationTeam } from "@/modules/ee/teams/team-list/types/team";
 import { Alert, AlertDescription } from "@/modules/ui/components/alert";
 import { Button } from "@/modules/ui/components/button";
-import { FormField, FormItem, FormLabel } from "@/modules/ui/components/form";
+import { FormError, FormField, FormItem, FormLabel } from "@/modules/ui/components/form";
 import { Input } from "@/modules/ui/components/input";
 import { Label } from "@/modules/ui/components/label";
 import { MultiSelect } from "@/modules/ui/components/multi-select";
@@ -27,6 +28,7 @@ interface IndividualInviteTabProps {
  isFormbricksCloud: boolean;
  environmentId: string;
  membershipRole?: TOrganizationRole;
+  showTeamAdminRestrictions: boolean;
 }

 export const IndividualInviteTab = ({
@@ -37,22 +39,32 @@ export const IndividualInviteTab = ({
  isFormbricksCloud,
  environmentId,
  membershipRole,
+  showTeamAdminRestrictions,
 }: IndividualInviteTabProps) => {
  const ZFormSchema = z.object({
    name: ZUserName,
    email: z.string().min(1, { message: "Email is required" }).email({ message: "Invalid email" }),
    role: ZOrganizationRole,
-    teamIds: z.array(z.string()),
+    teamIds: showTeamAdminRestrictions
+      ? z.array(ZId).min(1, { message: "Team admins must select at least one team" })
+      : z.array(ZId),
  });

  const router = useRouter();

  type TFormData = z.infer<typeof ZFormSchema>;
  const { t } = useTranslation();
+
+  // Determine default role based on permissions
+  let defaultRole: TOrganizationRole = "owner";
+  if (showTeamAdminRestrictions || isAccessControlAllowed) {
+    defaultRole = "member";
+  }
+
  const form = useForm<TFormData>({
    resolver: zodResolver(ZFormSchema),
    defaultValues: {
-      role: isAccessControlAllowed ? "member" : "owner",
+      role: defaultRole,
      teamIds: [],
    },
  });
@@ -104,43 +116,61 @@ export const IndividualInviteTab = ({
          {errors.email && <p className="mt-1 text-sm text-red-500">{errors.email.message}</p>}
        </div>
        <div>
-          <AddMemberRole
-            control={control}
-            isAccessControlAllowed={isAccessControlAllowed}
-            isFormbricksCloud={isFormbricksCloud}
-            membershipRole={membershipRole}
-          />
-          {watch("role") === "member" && (
-            <Alert className="mt-2" variant="info">
-              <AlertDescription>{t("environments.settings.teams.member_role_info_message")}</AlertDescription>
-            </Alert>
+          {showTeamAdminRestrictions ? (
+            <div className="flex flex-col space-y-2">
+              <Label htmlFor="memberRoleSelect">{t("environments.settings.teams.organization_role")}</Label>
+              <Input value={t("environments.settings.teams.member")} disabled />
+            </div>
+          ) : (
+            <>
+              <AddMemberRole
+                control={control}
+                isAccessControlAllowed={isAccessControlAllowed}
+                isFormbricksCloud={isFormbricksCloud}
+                membershipRole={membershipRole}
+              />
+              {watch("role") === "member" && (
+                <Alert className="mt-2" variant="info">
+                  <AlertDescription>
+                    {t("environments.settings.teams.member_role_info_message")}
+                  </AlertDescription>
+                </Alert>
+              )}
+            </>
          )}
        </div>

        {isAccessControlAllowed && (
-          <FormField
-            control={control}
-            name="teamIds"
-            render={({ field }) => (
-              <FormItem className="flex flex-col space-y-2">
-                <FormLabel>{t("common.add_to_team")} </FormLabel>
-                <div className="space-y-2">
-                  <MultiSelect
-                    value={field.value}
-                    options={teamOptions}
-                    placeholder={t("environments.settings.teams.team_select_placeholder")}
-                    disabled={!teamOptions.length}
-                    onChange={(val) => field.onChange(val)}
-                  />
-                  {!teamOptions.length && (
-                    <Small className="font-normal text-amber-600">
-                      {t("environments.settings.teams.create_first_team_message")}
-                    </Small>
-                  )}
-                </div>
-              </FormItem>
-            )}
-          />
+          <>
+            <FormField
+              control={control}
+              name="teamIds"
+              render={({ field }) => (
+                <FormItem className="flex flex-col space-y-2">
+                  <FormLabel>{t("common.add_to_team")} </FormLabel>
+                  <div className="space-y-2">
+                    <MultiSelect
+                      value={field.value}
+                      options={teamOptions}
+                      placeholder={t("environments.settings.teams.team_select_placeholder")}
+                      disabled={!teamOptions.length}
+                      onChange={(val) => field.onChange(val)}
+                    />
+                    {!teamOptions.length && (
+                      <Small className="font-normal text-amber-600">
+                        {t("environments.settings.teams.create_first_team_message")}
+                      </Small>
+                    )}
+                  </div>
+                  <FormError>{errors.teamIds?.message}</FormError>
+                </FormItem>
+              )}
+            />
+            <div className="flex flex-col space-y-2">
+              <Label htmlFor="teamRoleInput">{t("common.team_role")}</Label>
+              <Input value={t("environments.settings.teams.contributor")} disabled />
+            </div>
+          </>
        )}

        {!isAccessControlAllowed && (
--- a/apps/web/modules/organization/settings/teams/components/invite-member/invite-member-modal.tsx
+++ b/apps/web/modules/organization/settings/teams/components/invite-member/invite-member-modal.tsx
@@ -26,6 +26,9 @@ interface InviteMemberModalProps {
  environmentId: string;
  membershipRole?: TOrganizationRole;
  isStorageConfigured: boolean;
+  isOwnerOrManager: boolean;
+  isTeamAdmin: boolean;
+  userAdminTeamIds?: string[];
 }

 export const InviteMemberModal = ({
@@ -38,11 +41,21 @@ export const InviteMemberModal = ({
  environmentId,
  membershipRole,
  isStorageConfigured,
+  isOwnerOrManager,
+  isTeamAdmin,
+  userAdminTeamIds,
 }: InviteMemberModalProps) => {
  const [type, setType] = useState<"individual" | "bulk">("individual");

  const { t } = useTranslation();

+  const showTeamAdminRestrictions = !isOwnerOrManager && isTeamAdmin;
+
+  const filteredTeams =
+    showTeamAdminRestrictions && userAdminTeamIds
+      ? teams.filter((t) => userAdminTeamIds.includes(t.id))
+      : teams;
+
  const tabs = {
    individual: (
      <IndividualInviteTab
@@ -51,8 +64,9 @@ export const InviteMemberModal = ({
        onSubmit={onSubmit}
        isAccessControlAllowed={isAccessControlAllowed}
        isFormbricksCloud={isFormbricksCloud}
-        teams={teams}
+        teams={filteredTeams}
        membershipRole={membershipRole}
+        showTeamAdminRestrictions={showTeamAdminRestrictions}
      />
    ),
    bulk: (
@@ -75,16 +89,18 @@ export const InviteMemberModal = ({
        </DialogHeader>

        <DialogBody className="flex flex-col gap-6" unconstrained>
-          <TabToggle
-            id="type"
-            options={[
-              { value: "individual", label: t("environments.settings.teams.individual") },
-              { value: "bulk", label: t("environments.settings.teams.bulk_invite") },
-            ]}
-            onChange={(inviteType) => setType(inviteType)}
-            defaultSelected={type}
-          />
-          {tabs[type]}
+          {!showTeamAdminRestrictions && (
+            <TabToggle
+              id="type"
+              options={[
+                { value: "individual", label: t("environments.settings.teams.individual") },
+                { value: "bulk", label: t("environments.settings.teams.bulk_invite") },
+              ]}
+              onChange={(inviteType) => setType(inviteType)}
+              defaultSelected={type}
+            />
+          )}
+          {showTeamAdminRestrictions ? tabs.individual : tabs[type]}
        </DialogBody>
      </DialogContent>
    </Dialog>
--- a/apps/web/modules/organization/settings/teams/components/members-view.tsx
+++ b/apps/web/modules/organization/settings/teams/components/members-view.tsx
@@ -5,6 +5,7 @@ import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/
 import { INVITE_DISABLED, IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getTranslate } from "@/lingodotdev/server";
 import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
+import { getTeamsWhereUserIsAdmin } from "@/modules/ee/teams/lib/roles";
 import { getTeamsByOrganizationId } from "@/modules/ee/teams/team-list/lib/team";
 import { TOrganizationTeam } from "@/modules/ee/teams/team-list/types/team";
 import { EditMemberships } from "@/modules/organization/settings/teams/components/edit-memberships";
@@ -45,6 +46,10 @@ export const MembersView = async ({

  const isMultiOrgEnabled = await getIsMultiOrgEnabled();

+  // Fetch admin teams if they're a team admin
+  const userAdminTeamIds = await getTeamsWhereUserIsAdmin(currentUserId, organization.id);
+  const isTeamAdminUser = userAdminTeamIds.length > 0;
+
  let teams: TOrganizationTeam[] = [];

  if (isAccessControlAllowed) {
@@ -69,6 +74,8 @@ export const MembersView = async ({
          isMultiOrgEnabled={isMultiOrgEnabled}
          teams={teams}
          isUserManagementDisabledFromUi={isUserManagementDisabledFromUi}
+          isTeamAdmin={isTeamAdminUser}
+          userAdminTeamIds={userAdminTeamIds}
        />
      )}

--- a/apps/web/modules/organization/settings/teams/page.tsx
+++ b/apps/web/modules/organization/settings/teams/page.tsx
@@ -3,6 +3,7 @@ import { IS_FORMBRICKS_CLOUD, USER_MANAGEMENT_MINIMUM_ROLE } from "@/lib/constan
 import { getUserManagementAccess } from "@/lib/membership/utils";
 import { getTranslate } from "@/lingodotdev/server";
 import { getAccessControlPermission } from "@/modules/ee/license-check/lib/utils";
+import { getTeamsWhereUserIsAdmin } from "@/modules/ee/teams/lib/roles";
 import { TeamsView } from "@/modules/ee/teams/team-list/components/teams-view";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { MembersView } from "@/modules/organization/settings/teams/components/members-view";
@@ -16,11 +17,21 @@ export const TeamsPage = async (props) => {
  const { session, currentUserMembership, organization } = await getEnvironmentAuth(params.environmentId);

  const isAccessControlAllowed = await getAccessControlPermission(organization.billing.plan);
-  const hasUserManagementAccess = getUserManagementAccess(
+
+  // Check if user has standard user management access (owner/manager)
+  const hasStandardUserManagementAccess = getUserManagementAccess(
    currentUserMembership?.role,
    USER_MANAGEMENT_MINIMUM_ROLE
  );

+  // Also check if user is a team admin (they get limited user management for invites)
+  const userAdminTeamIds = await getTeamsWhereUserIsAdmin(session.user.id, organization.id);
+  const isTeamAdminUser = userAdminTeamIds.length > 0;
+
+  // Allow user management UI if they're owner/manager OR team admin (when access control is enabled)
+  const hasUserManagementAccess =
+    hasStandardUserManagementAccess || (isAccessControlAllowed && isTeamAdminUser);
+
  return (
    <PageContentWrapper>
      <PageHeader pageTitle={t("environments.settings.general.organization_settings")}>
--- a/apps/web/modules/survey/link/components/link-survey-wrapper.tsx
+++ b/apps/web/modules/survey/link/components/link-survey-wrapper.tsx
@@ -79,7 +79,9 @@ export const LinkSurveyWrapper = ({
          styling={styling}
          onBackgroundLoaded={handleBackgroundLoaded}>
          <div className="flex max-h-dvh min-h-dvh items-center justify-center overflow-clip">
-            {!styling.isLogoHidden && (project.logo?.url || styling.logo?.url) && <ClientLogo projectLogo={project.logo} surveyLogo={styling.logo} />}
+            {!styling.isLogoHidden && (project.logo?.url || styling.logo?.url) && (
+              <ClientLogo projectLogo={project.logo} surveyLogo={styling.logo} />
+            )}
            <div className="h-full w-full max-w-4xl space-y-6 px-1.5">
              {isPreview && (
                <div className="fixed left-0 top-0 flex w-full items-center justify-between bg-slate-600 p-2 px-4 text-center text-sm text-white shadow-sm">
--- a/apps/web/modules/ui/components/client-logo/index.tsx
+++ b/apps/web/modules/ui/components/client-logo/index.tsx
@@ -15,7 +15,12 @@ interface ClientLogoProps {
  previewSurvey?: boolean;
 }

-export const ClientLogo = ({ environmentId, projectLogo, surveyLogo, previewSurvey = false }: ClientLogoProps) => {
+export const ClientLogo = ({
+  environmentId,
+  projectLogo,
+  surveyLogo,
+  previewSurvey = false,
+}: ClientLogoProps) => {
  const { t } = useTranslation();
  const logoToUse = surveyLogo?.url ? surveyLogo : projectLogo;

--- a/apps/web/modules/ui/components/select/index.tsx
+++ b/apps/web/modules/ui/components/select/index.tsx
@@ -18,7 +18,7 @@ const SelectTrigger = React.forwardRef<
  <SelectPrimitive.Trigger
    ref={ref}
    className={cn(
-      "flex h-9 w-full items-center justify-between gap-2 rounded-md border border-slate-300 bg-transparent px-3 py-2 text-sm hover:border-slate-400 focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-50 data-[placeholder]:text-slate-400",
+      "flex h-9 w-full items-center justify-between gap-2 rounded-md border border-slate-300 bg-transparent px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-1 hover:enabled:border-slate-400 disabled:cursor-not-allowed disabled:opacity-50 data-[placeholder]:text-slate-400",
      className
    )}
    {...props}>
--- a/apps/web/playwright/organization.spec.ts
+++ b/apps/web/playwright/organization.spec.ts
@@ -20,7 +20,7 @@ test.describe("Invite, accept and remove organization member", async () => {

      await page.locator('[data-testid="members-loading-card"]:first-child').waitFor({ state: "hidden" });

-      await page.getByRole("link", { name: "Access Control" }).click();
+      await page.getByRole("link", { name: "Members & Teams" }).click();

      // Add member button
      await expect(page.getByRole("button", { name: "Invite member" })).toBeVisible();
@@ -131,8 +131,8 @@ test.describe("Create, update and delete team", async () => {
    await page.waitForURL(/\/environments\/[^/]+\/settings\/general/);

    await page.waitForTimeout(2000);
-    await expect(page.getByText("Access Control")).toBeVisible();
-    await page.getByText("Access Control").click();
+    await expect(page.getByText("Members & Teams")).toBeVisible();
+    await page.getByText("Members & Teams").click();
    await page.waitForURL(/\/environments\/[^/]+\/settings\/teams/);
    await expect(page.getByRole("button", { name: "Create new team" })).toBeVisible();
    await page.getByRole("button", { name: "Create new team" }).click();
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7754,6 +7754,7 @@ packages:
  next@15.5.7:
    resolution: {integrity: sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==}
    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/CVE-2025-66478 for more details.
    hasBin: true
    peerDependencies:
      '@opentelemetry/api': ^1.1.0