From 3ce67bacad8d21327f07a4838da1441b2138959d Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 15 Apr 2026 12:16:33 -0700
Subject: [PATCH 1/5] [Feature] UI - Users: add Send Invitation Email toggle to
 Invite User modal

The Invite User flow was calling /user/new without send_invite_email, so
the backend invitation-email hook (gated on send_invite_email is True)
was silently skipped. Add a checkbox, default on, so admins can opt
out when needed.
---
 .../src/components/CreateUserButton.tsx       | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index b65caec26d0..7d2fc101508 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -2,7 +2,7 @@ import { InfoCircleOutlined, UserAddOutlined } from "@ant-design/icons";
 import { useQueryClient } from "@tanstack/react-query";
 import { useOrganizations } from "@/app/(dashboard)/hooks/organizations/useOrganizations";
 import { Accordion, AccordionBody, AccordionHeader, SelectItem, TextInput } from "@tremor/react";
-import { Alert, Button, Form, Input, Modal, Select, Select as Select2, Space, Tooltip, Typography } from "antd";
+import { Alert, Button, Checkbox, Form, Input, Modal, Select, Select as Select2, Space, Tooltip, Typography } from "antd";
 import React, { useEffect, useMemo, useState } from "react";
 import BulkCreateUsers from "./bulk_create_users_button";
 import TeamDropdown from "./common_components/team_dropdown";
@@ -113,6 +113,7 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
     user_role: string;
     organization_ids?: string[];
     organizations?: string[];
+    send_invite_email?: boolean;
   }) => {
     try {
       NotificationsManager.info("Making API Call");
@@ -181,7 +182,7 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
         labelCol={{ span: 8 }}
         wrapperCol={{ span: 16 }}
         labelAlign="left"
-        initialValues={{ user_role: "internal_user_viewer" }}
+        initialValues={{ user_role: "internal_user_viewer", send_invite_email: true }}
       >
         <Alert
           message="Email invitations"
@@ -224,6 +225,14 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
 
+        <Form.Item
+          name="send_invite_email"
+          valuePropName="checked"
+          wrapperCol={{ offset: 8, span: 16 }}
+        >
+          <Checkbox>Send invitation email</Checkbox>
+        </Form.Item>
+
         <div style={{ textAlign: "right", marginTop: "10px" }}>
           <Button htmlType="submit">Create User</Button>
         </div>
@@ -270,7 +279,7 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           labelCol={{ span: 8 }}
           wrapperCol={{ span: 16 }}
           labelAlign="left"
-          initialValues={{ user_role: "internal_user_viewer" }}
+          initialValues={{ user_role: "internal_user_viewer", send_invite_email: true }}
         >
           <Form.Item label="User Email" name="user_email">
             <Input />
@@ -360,6 +369,15 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
               </Form.Item>
             </AccordionBody>
           </Accordion>
+
+          <Form.Item
+            name="send_invite_email"
+            valuePropName="checked"
+            wrapperCol={{ offset: 8, span: 16 }}
+          >
+            <Checkbox>Send invitation email</Checkbox>
+          </Form.Item>
+
           <div style={{ textAlign: "right", marginTop: "10px" }}>
             <Button type="primary" icon={<UserAddOutlined />} htmlType="submit">
               Invite User

From fde7c1087ae55e1171a156e152859db64c2ee482 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 15 Apr 2026 12:24:41 -0700
Subject: [PATCH 2/5] Move Send Invitation Email checkbox into modal footer,
 add tests

Place the checkbox inline with the submit button (left-aligned,
vertically centered) in both the embedded and standalone forms.
Add Vitest tests verifying the /user/new payload shape: default true,
false when unchecked, in both form variants, plus an initial-state
check for the modal.
---
 .../src/components/CreateUserButton.test.tsx  | 122 ++++++++++++++++++
 .../src/components/CreateUserButton.tsx       |  44 ++++---
 2 files changed, 150 insertions(+), 16 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.test.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.test.tsx
index 03d982ca7c2..d3e2e452909 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.test.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.test.tsx
@@ -354,4 +354,126 @@ describe("CreateUserButton", () => {
       expect(mockOrganizationMemberAddCall).not.toHaveBeenCalled();
     });
   });
+
+  describe("send invitation email toggle", () => {
+    it("should send send_invite_email true by default in embedded mode", async () => {
+      const user = userEvent.setup();
+      mockUserCreateCall.mockResolvedValue({ data: { user_id: "default-on-user" } });
+
+      renderWithProviders(
+        <CreateUserButton {...defaultProps} possibleUIRoles={{ proxy_user: { ui_label: "User", description: "" } }} isEmbedded />,
+      );
+
+      await user.type(screen.getByLabelText(/user email/i), "default@example.com");
+      await user.click(screen.getByRole("combobox", { name: /user role/i }));
+      await user.click(screen.getByText("User"));
+      await user.click(screen.getByRole("button", { name: /create user/i }));
+
+      await waitFor(() => {
+        expect(mockUserCreateCall).toHaveBeenCalledWith("token", null, expect.objectContaining({
+          send_invite_email: true,
+        }));
+      });
+    });
+
+    it("should send send_invite_email false when the checkbox is unchecked in embedded mode", async () => {
+      const user = userEvent.setup();
+      mockUserCreateCall.mockResolvedValue({ data: { user_id: "unchecked-user" } });
+
+      renderWithProviders(
+        <CreateUserButton {...defaultProps} possibleUIRoles={{ proxy_user: { ui_label: "User", description: "" } }} isEmbedded />,
+      );
+
+      await user.type(screen.getByLabelText(/user email/i), "off@example.com");
+      await user.click(screen.getByRole("combobox", { name: /user role/i }));
+      await user.click(screen.getByText("User"));
+      await user.click(screen.getByRole("checkbox", { name: /send invitation email/i }));
+      await user.click(screen.getByRole("button", { name: /create user/i }));
+
+      await waitFor(() => {
+        expect(mockUserCreateCall).toHaveBeenCalledWith("token", null, expect.objectContaining({
+          send_invite_email: false,
+        }));
+      });
+    });
+
+    it("should send send_invite_email true by default in standalone mode", async () => {
+      const user = userEvent.setup();
+      mockUserCreateCall.mockResolvedValue({ data: { user_id: "standalone-default-user" } });
+      mockInvitationCreateCall.mockResolvedValue({
+        id: "inv-default",
+        user_id: "standalone-default-user",
+        has_user_setup_sso: false,
+      } as any);
+
+      renderWithProviders(
+        <CreateUserButton {...defaultProps} possibleUIRoles={{ proxy_user: { ui_label: "User", description: "" } }} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByRole("button", { name: /\+ invite user/i })).toBeInTheDocument();
+      });
+      await user.click(screen.getByRole("button", { name: /\+ invite user/i }));
+
+      const dialog = screen.getByRole("dialog", { name: /invite user/i });
+      await user.type(within(dialog).getByLabelText(/user email/i), "standalone-default@example.com");
+      await user.click(within(dialog).getByRole("combobox", { name: /global proxy role/i }));
+      await user.click(screen.getByText("User"));
+      await user.click(within(dialog).getByRole("button", { name: /invite user/i }));
+
+      await waitFor(() => {
+        expect(mockUserCreateCall).toHaveBeenCalledWith("token", null, expect.objectContaining({
+          send_invite_email: true,
+        }));
+      });
+    });
+
+    it("should send send_invite_email false when the checkbox is unchecked in standalone mode", async () => {
+      const user = userEvent.setup();
+      mockUserCreateCall.mockResolvedValue({ data: { user_id: "standalone-off-user" } });
+      mockInvitationCreateCall.mockResolvedValue({
+        id: "inv-off",
+        user_id: "standalone-off-user",
+        has_user_setup_sso: false,
+      } as any);
+
+      renderWithProviders(
+        <CreateUserButton {...defaultProps} possibleUIRoles={{ proxy_user: { ui_label: "User", description: "" } }} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByRole("button", { name: /\+ invite user/i })).toBeInTheDocument();
+      });
+      await user.click(screen.getByRole("button", { name: /\+ invite user/i }));
+
+      const dialog = screen.getByRole("dialog", { name: /invite user/i });
+      await user.type(within(dialog).getByLabelText(/user email/i), "standalone-off@example.com");
+      await user.click(within(dialog).getByRole("combobox", { name: /global proxy role/i }));
+      await user.click(screen.getByText("User"));
+      await user.click(within(dialog).getByRole("checkbox", { name: /send invitation email/i }));
+      await user.click(within(dialog).getByRole("button", { name: /invite user/i }));
+
+      await waitFor(() => {
+        expect(mockUserCreateCall).toHaveBeenCalledWith("token", null, expect.objectContaining({
+          send_invite_email: false,
+        }));
+      });
+    });
+
+    it("should keep the checkbox checked by default when the modal is opened in standalone mode", async () => {
+      const user = userEvent.setup();
+
+      renderWithProviders(
+        <CreateUserButton {...defaultProps} possibleUIRoles={{ proxy_user: { ui_label: "User", description: "" } }} />,
+      );
+
+      await waitFor(() => {
+        expect(screen.getByRole("button", { name: /\+ invite user/i })).toBeInTheDocument();
+      });
+      await user.click(screen.getByRole("button", { name: /\+ invite user/i }));
+
+      const dialog = screen.getByRole("dialog", { name: /invite user/i });
+      expect(within(dialog).getByRole("checkbox", { name: /send invitation email/i })).toBeChecked();
+    });
+  });
 });
diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index 7d2fc101508..5a3c035bd6a 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -225,15 +225,21 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
 
-        <Form.Item
-          name="send_invite_email"
-          valuePropName="checked"
-          wrapperCol={{ offset: 8, span: 16 }}
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "space-between",
+            alignItems: "center",
+            marginTop: "10px",
+          }}
         >
-          <Checkbox>Send invitation email</Checkbox>
-        </Form.Item>
-
-        <div style={{ textAlign: "right", marginTop: "10px" }}>
+          <Form.Item
+            name="send_invite_email"
+            valuePropName="checked"
+            style={{ marginBottom: 0 }}
+          >
+            <Checkbox>Send invitation email</Checkbox>
+          </Form.Item>
           <Button htmlType="submit">Create User</Button>
         </div>
       </Form>
@@ -370,15 +376,21 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
             </AccordionBody>
           </Accordion>
 
-          <Form.Item
-            name="send_invite_email"
-            valuePropName="checked"
-            wrapperCol={{ offset: 8, span: 16 }}
+          <div
+            style={{
+              display: "flex",
+              justifyContent: "space-between",
+              alignItems: "center",
+              marginTop: "10px",
+            }}
           >
-            <Checkbox>Send invitation email</Checkbox>
-          </Form.Item>
-
-          <div style={{ textAlign: "right", marginTop: "10px" }}>
+            <Form.Item
+              name="send_invite_email"
+              valuePropName="checked"
+              style={{ marginBottom: 0 }}
+            >
+              <Checkbox>Send invitation email</Checkbox>
+            </Form.Item>
             <Button type="primary" icon={<UserAddOutlined />} htmlType="submit">
               Invite User
             </Button>

From 55829c225423f0432ac54adaeb8c4c7ef3b278b3 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 15 Apr 2026 12:28:41 -0700
Subject: [PATCH 3/5] Render Send Invitation Email as a labeled form item to
 align with other fields

---
 .../src/components/CreateUserButton.tsx       | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index 5a3c035bd6a..ed5b8f8f8fd 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -225,21 +225,15 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
 
-        <div
-          style={{
-            display: "flex",
-            justifyContent: "space-between",
-            alignItems: "center",
-            marginTop: "10px",
-          }}
+        <Form.Item
+          label="Send invitation email"
+          name="send_invite_email"
+          valuePropName="checked"
         >
-          <Form.Item
-            name="send_invite_email"
-            valuePropName="checked"
-            style={{ marginBottom: 0 }}
-          >
-            <Checkbox>Send invitation email</Checkbox>
-          </Form.Item>
+          <Checkbox />
+        </Form.Item>
+
+        <div style={{ textAlign: "right", marginTop: "10px" }}>
           <Button htmlType="submit">Create User</Button>
         </div>
       </Form>
@@ -376,21 +370,15 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
             </AccordionBody>
           </Accordion>
 
-          <div
-            style={{
-              display: "flex",
-              justifyContent: "space-between",
-              alignItems: "center",
-              marginTop: "10px",
-            }}
+          <Form.Item
+            label="Send invitation email"
+            name="send_invite_email"
+            valuePropName="checked"
           >
-            <Form.Item
-              name="send_invite_email"
-              valuePropName="checked"
-              style={{ marginBottom: 0 }}
-            >
-              <Checkbox>Send invitation email</Checkbox>
-            </Form.Item>
+            <Checkbox />
+          </Form.Item>
+
+          <div style={{ textAlign: "right", marginTop: "10px" }}>
             <Button type="primary" icon={<UserAddOutlined />} htmlType="submit">
               Invite User
             </Button>

From a7c947f9dd577d60105e1b4e6d83d916e396063a Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 15 Apr 2026 12:31:23 -0700
Subject: [PATCH 4/5] Move Send Invitation Email field directly below User
 Email in both forms

---
 .../src/components/CreateUserButton.tsx       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index ed5b8f8f8fd..cdfe9fa36e3 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -202,6 +202,13 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
         <Form.Item label="User Email" name="user_email">
           <TextInput placeholder="" />
         </Form.Item>
+        <Form.Item
+          label="Send invitation email"
+          name="send_invite_email"
+          valuePropName="checked"
+        >
+          <Checkbox />
+        </Form.Item>
         <Form.Item label="User Role" name="user_role">
           <Select2>
             {possibleUIRoles &&
@@ -225,14 +232,6 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
 
-        <Form.Item
-          label="Send invitation email"
-          name="send_invite_email"
-          valuePropName="checked"
-        >
-          <Checkbox />
-        </Form.Item>
-
         <div style={{ textAlign: "right", marginTop: "10px" }}>
           <Button htmlType="submit">Create User</Button>
         </div>
@@ -284,6 +283,13 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Form.Item label="User Email" name="user_email">
             <Input />
           </Form.Item>
+          <Form.Item
+            label="Send invitation email"
+            name="send_invite_email"
+            valuePropName="checked"
+          >
+            <Checkbox />
+          </Form.Item>
           <Form.Item
             label={
               <span>
@@ -370,14 +376,6 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
             </AccordionBody>
           </Accordion>
 
-          <Form.Item
-            label="Send invitation email"
-            name="send_invite_email"
-            valuePropName="checked"
-          >
-            <Checkbox />
-          </Form.Item>
-
           <div style={{ textAlign: "right", marginTop: "10px" }}>
             <Button type="primary" icon={<UserAddOutlined />} htmlType="submit">
               Invite User

From 442a5aea0def2cc0b7e514f233f6d931f03c65a6 Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Wed, 15 Apr 2026 12:33:12 -0700
Subject: [PATCH 5/5] Move Send Invitation Email field under Metadata in both
 forms

---
 .../src/components/CreateUserButton.tsx       | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/CreateUserButton.tsx b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
index cdfe9fa36e3..9f5c1aa13c6 100644
--- a/ui/litellm-dashboard/src/components/CreateUserButton.tsx
+++ b/ui/litellm-dashboard/src/components/CreateUserButton.tsx
@@ -202,13 +202,6 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
         <Form.Item label="User Email" name="user_email">
           <TextInput placeholder="" />
         </Form.Item>
-        <Form.Item
-          label="Send invitation email"
-          name="send_invite_email"
-          valuePropName="checked"
-        >
-          <Checkbox />
-        </Form.Item>
         <Form.Item label="User Role" name="user_role">
           <Select2>
             {possibleUIRoles &&
@@ -232,6 +225,14 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
         </Form.Item>
 
+        <Form.Item
+          label="Send invitation email"
+          name="send_invite_email"
+          valuePropName="checked"
+        >
+          <Checkbox />
+        </Form.Item>
+
         <div style={{ textAlign: "right", marginTop: "10px" }}>
           <Button htmlType="submit">Create User</Button>
         </div>
@@ -283,13 +284,6 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Form.Item label="User Email" name="user_email">
             <Input />
           </Form.Item>
-          <Form.Item
-            label="Send invitation email"
-            name="send_invite_email"
-            valuePropName="checked"
-          >
-            <Checkbox />
-          </Form.Item>
           <Form.Item
             label={
               <span>
@@ -341,6 +335,13 @@ export const CreateUserButton: React.FC<CreateuserProps> = ({
           <Form.Item label="Metadata" name="metadata">
             <Input.TextArea rows={4} placeholder="Enter metadata as JSON" />
           </Form.Item>
+          <Form.Item
+            label="Send invitation email"
+            name="send_invite_email"
+            valuePropName="checked"
+          >
+            <Checkbox />
+          </Form.Item>
           <Accordion>
             <AccordionHeader>
               <Text strong>Personal Key Creation</Text>