diff --git a/ui/admin/app/components/composed/NameDescriptionForm.tsx b/ui/admin/app/components/composed/NameDescriptionForm.tsx
index 9a2a443e..ad744e26 100644
--- a/ui/admin/app/components/composed/NameDescriptionForm.tsx
+++ b/ui/admin/app/components/composed/NameDescriptionForm.tsx
@@ -7,6 +7,7 @@ import { z } from "zod";
 import { ControlledInput } from "~/components/form/controlledInputs";
 import { Button } from "~/components/ui/button";
 import { Form } from "~/components/ui/form";
+import { InputProps } from "~/components/ui/input";
 
 const formSchema = z.object({
     params: z.array(
@@ -28,10 +29,14 @@ export function NameDescriptionForm({
     defaultValues,
     onChange,
     addLabel = "Add",
+    nameFieldProps,
+    descriptionFieldProps,
 }: {
     defaultValues: Item[];
     onChange: (values: Item[]) => void;
     addLabel?: string;
+    nameFieldProps?: InputProps;
+    descriptionFieldProps?: InputProps;
 }) {
     const form = useForm<ParamFormValues>({
         resolver: zodResolver(formSchema),
@@ -63,6 +68,7 @@ export function NameDescriptionForm({
                         key={field.id}
                     >
                         <ControlledInput
+                            {...nameFieldProps}
                             control={form.control}
                             name={`params.${i}.name`}
                             placeholder="Name"
@@ -70,6 +76,7 @@ export function NameDescriptionForm({
                         />
 
                         <ControlledInput
+                            {...descriptionFieldProps}
                             control={form.control}
                             name={`params.${i}.description`}
                             placeholder="Description"
diff --git a/ui/admin/app/components/model-providers/ModelProviderForm.tsx b/ui/admin/app/components/model-providers/ModelProviderForm.tsx
index a63a86e6..cdbb6559 100644
--- a/ui/admin/app/components/model-providers/ModelProviderForm.tsx
+++ b/ui/admin/app/components/model-providers/ModelProviderForm.tsx
@@ -223,6 +223,7 @@ export function ModelProviderForm({
                                             )}
                                             control={form.control}
                                             name={`requiredConfigParams.${i}.value`}
+                                            type="password"
                                             classNames={{
                                                 wrapper:
                                                     "flex-auto bg-background",
@@ -265,6 +266,7 @@ export function ModelProviderForm({
                         : null}
                 </div>
                 <NameDescriptionForm
+                    descriptionFieldProps={{ type: "password" }}
                     defaultValues={form.watch("additionalConfirmParams")}
                     onChange={(values) =>
                         form.setValue("additionalConfirmParams", values)