diff --git a/package-lock.json b/package-lock.json
index 0b2883a1..49b790e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,11 +18,7 @@
         "@radix-ui/react-dialog": "^1.1.4",
         "@radix-ui/react-separator": "^1.1.0",
         "@radix-ui/react-slot": "^1.1.0",
-<<<<<<< HEAD
         "@stacklok/ui-kit": "^1.0.1-4",
-=======
-        "@stacklok/ui-kit": "^1.0.1-2",
->>>>>>> 79c794a (chore: add dnd-kit, uuid and upgrade ui-kit)
         "@tanstack/react-query": "^5.64.1",
         "@tanstack/react-query-devtools": "^5.66.0",
         "@types/lodash": "^4.17.15",
diff --git a/src/features/providers/components/provider-form.tsx b/src/features/providers/components/provider-form.tsx
index 84833d4c..f3aa2873 100644
--- a/src/features/providers/components/provider-form.tsx
+++ b/src/features/providers/components/provider-form.tsx
@@ -17,8 +17,6 @@ interface Props {
 export function ProviderForm({ provider, setProvider }: Props) {
   const providerAuthType =
     provider.auth_type || getProviderAuthByType(provider.provider_type)
-  const providerEndpoint =
-    provider.endpoint || getProviderEndpointByAuthType(provider.provider_type)
 
   const handleProviderType = (provider: AddProviderEndpointRequest) => {
     setProvider({
@@ -87,7 +85,7 @@ export function ProviderForm({ provider, setProvider }: Props) {
           onChange={(endpoint) => setProvider({ ...provider, endpoint })}
         >
           <Label>Endpoint</Label>
-          <Input placeholder="Provider endpoint" value={providerEndpoint} />
+          <Input placeholder="Provider endpoint" value={provider.endpoint} />
         </TextField>
       </div>
       <div className="py-3">
diff --git a/src/routes/route-provider-create.tsx b/src/routes/route-provider-create.tsx
index bb711b31..98059334 100644
--- a/src/routes/route-provider-create.tsx
+++ b/src/routes/route-provider-create.tsx
@@ -7,6 +7,7 @@ import { ProviderDialog } from '@/features/providers/components/provider-dialog'
 import { ProviderDialogFooter } from '@/features/providers/components/provider-dialog-footer'
 import { ProviderForm } from '@/features/providers/components/provider-form'
 import { useMutationCreateProvider } from '@/features/providers/hooks/use-mutation-create-provider'
+import { getProviderEndpointByAuthType } from '@/features/providers/lib/utils'
 import { DialogContent, Form } from '@stacklok/ui-kit'
 import { useState } from 'react'
 
@@ -20,9 +21,13 @@ const DEFAULT_PROVIDER_STATE = {
 }
 
 export function RouteProviderCreate() {
-  const [provider, setProvider] = useState<AddProviderEndpointRequest>(
-    DEFAULT_PROVIDER_STATE
-  )
+  const [provider, setProvider] = useState<AddProviderEndpointRequest>({
+    ...DEFAULT_PROVIDER_STATE,
+    endpoint: getProviderEndpointByAuthType(
+      DEFAULT_PROVIDER_STATE.provider_type
+    ),
+  })
+
   const { mutateAsync } = useMutationCreateProvider()
 
   const handleSubmit = (event: React.FormEvent) => {