diff --git a/ui/litellm-dashboard/src/components/edit_user.tsx b/ui/litellm-dashboard/src/components/edit_user.tsx
index 4932abe192..0d5d14e64d 100644
--- a/ui/litellm-dashboard/src/components/edit_user.tsx
+++ b/ui/litellm-dashboard/src/components/edit_user.tsx
@@ -44,9 +44,9 @@ const EditUserModal: React.FC<EditUserModalProps> = ({ visible, possibleUIRoles,
 
   const handleEditSubmit = async (formValues: Record<string, any>) => {
     // Call API to update team with teamId and values
-    form.resetFields();
-
     onSubmit(formValues);
+
+    form.resetFields();
     onCancel();
   };
 
@@ -95,15 +95,15 @@ const EditUserModal: React.FC<EditUserModalProps> = ({ visible, possibleUIRoles,
               name="user_role"
             >
             <Select2>
-    {possibleUIRoles &&
-        Object.entries(possibleUIRoles).map(([role, { ui_label, description }]) => (
-            <SelectItem key={role} value={role} title={ui_label}>
-                <div className='flex'>
-                {ui_label} <p className="ml-2" style={{ color: "gray", fontSize: "12px" }}>{description}</p>
-                </div>
-            </SelectItem>
-        ))}
-</Select2>
+                {possibleUIRoles &&
+                    Object.entries(possibleUIRoles).map(([role, { ui_label, description }]) => (
+                        <SelectItem key={role} value={role} title={ui_label}>
+                            <div className='flex'>
+                            {ui_label} <p className="ml-2" style={{ color: "gray", fontSize: "12px" }}>{description}</p>
+                            </div>
+                        </SelectItem>
+                    ))}
+            </Select2>
 
             </Form.Item>
 
diff --git a/ui/litellm-dashboard/src/components/view_users.tsx b/ui/litellm-dashboard/src/components/view_users.tsx
index 9e28913285..ea1625514c 100644
--- a/ui/litellm-dashboard/src/components/view_users.tsx
+++ b/ui/litellm-dashboard/src/components/view_users.tsx
@@ -78,7 +78,7 @@ const ViewUserDashboard: React.FC<ViewUserDashboardProps> = ({
       return;
     }
 
-    userUpdateUserCall(accessToken, editedUser, userRole);
+    userUpdateUserCall(accessToken, editedUser, null);
 
     if (userData) {
       const updatedUserData = userData.map((user) =>