diff --git a/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx b/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
index 1b54b2f12..2377d5d16 100644
--- a/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
+++ b/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
@@ -213,7 +213,7 @@ export function ProviderCreationModal({
                 ) : (
                   <TextFormField
                     name="api_key"
-                    label={`API Key ${isProxy && "(for non-local deployments)"}`}
+                    label={`API Key ${isProxy ? "(for non-local deployments)" : ""}`}
                     placeholder="API Key"
                     type="password"
                   />
diff --git a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
index 6f1f9bcdf..303425b72 100644
--- a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
+++ b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
@@ -197,7 +197,7 @@ export default function EmbeddingForm() {
       newModel = {
         ...rerankingDetails,
         ...advancedEmbeddingDetails,
-        model_name: selectedProvider.model_name,
+        ...selectedProvider,
         provider_type:
           (selectedProvider.provider_type
             ?.toLowerCase()
@@ -209,7 +209,7 @@ export default function EmbeddingForm() {
         ...selectedProvider,
         ...rerankingDetails,
         ...advancedEmbeddingDetails,
-        model_name: selectedProvider.model_name!,
+        ...selectedProvider,
         provider_type: null,
       };
     }
diff --git a/web/src/app/chat/page.tsx b/web/src/app/chat/page.tsx
index 870ad963f..e043f5446 100644
--- a/web/src/app/chat/page.tsx
+++ b/web/src/app/chat/page.tsx
@@ -56,9 +56,7 @@ export default async function Page({
           defaultAssistantId,
         }}
       >
-        <ProviderContextProvider>
-          <WrappedChat initiallyToggled={toggleSidebar} />
-        </ProviderContextProvider>
+        <WrappedChat initiallyToggled={toggleSidebar} />
       </ChatProvider>
     </>
   );
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index 5b9435cbc..415990373 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -19,6 +19,7 @@ import { Card } from "@tremor/react";
 import { HeaderTitle } from "@/components/header/HeaderTitle";
 import { Logo } from "@/components/Logo";
 import { UserProvider } from "@/components/user/UserProvider";
+import { ProviderContextProvider } from "@/components/chat_search/ProviderContext";
 
 const inter = Inter({
   subsets: ["latin"],
@@ -138,9 +139,11 @@ export default async function RootLayout({
           }`}
         >
           <UserProvider>
-            <SettingsProvider settings={combinedSettings}>
-              {children}
-            </SettingsProvider>
+            <ProviderContextProvider>
+              <SettingsProvider settings={combinedSettings}>
+                {children}
+              </SettingsProvider>
+            </ProviderContextProvider>
           </UserProvider>
         </div>
       </body>
diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
index e317d271b..72f52a409 100644
--- a/web/src/app/search/page.tsx
+++ b/web/src/app/search/page.tsx
@@ -210,12 +210,10 @@ export default async function Home() {
           shouldDisplayNoSources: shouldDisplayNoSourcesModal,
         }}
       >
-        <ProviderContextProvider>
-          <WrappedSearch
-            initiallyToggled={toggleSidebar}
-            searchTypeDefault={searchTypeDefault}
-          />
-        </ProviderContextProvider>
+        <WrappedSearch
+          initiallyToggled={toggleSidebar}
+          searchTypeDefault={searchTypeDefault}
+        />
       </SearchProvider>
     </>
   );
diff --git a/web/src/components/initialSetup/welcome/WelcomeModal.tsx b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
index ec71c5e6d..5f32d614d 100644
--- a/web/src/components/initialSetup/welcome/WelcomeModal.tsx
+++ b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
@@ -13,6 +13,7 @@ import { ApiKeyForm } from "@/components/llm/ApiKeyForm";
 import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { checkLlmProvider } from "./lib";
 import { User } from "@/lib/types";
+import { useProviderStatus } from "@/components/chat_search/ProviderContext";
 
 function setWelcomeFlowComplete() {
   Cookies.set(COMPLETED_WELCOME_FLOW_COOKIE, "true", { expires: 365 });
@@ -62,6 +63,12 @@ export function _WelcomeModal({ user }: { user: User | null }) {
   const [providerOptions, setProviderOptions] = useState<
     WellKnownLLMProviderDescriptor[]
   >([]);
+  const { refreshProviderInfo } = useProviderStatus();
+
+  const clientSetWelcomeFlowComplete = async () => {
+    setWelcomeFlowComplete();
+    refreshProviderInfo();
+  };
 
   useEffect(() => {
     async function fetchProviderInfo() {
@@ -124,7 +131,7 @@ export function _WelcomeModal({ user }: { user: User | null }) {
                   href="/admin/add-connector"
                   onClick={(e) => {
                     e.preventDefault();
-                    setWelcomeFlowComplete();
+                    clientSetWelcomeFlowComplete();
                     router.push("/admin/add-connector");
                   }}
                   className="w-fit mx-auto"
@@ -183,7 +190,6 @@ export function _WelcomeModal({ user }: { user: User | null }) {
                 href="/admin/add-connector"
                 onClick={(e) => {
                   e.preventDefault();
-                  setWelcomeFlowComplete();
                   router.push("/admin/add-connector");
                 }}
               >
@@ -197,7 +203,7 @@ export function _WelcomeModal({ user }: { user: User | null }) {
                 href="/chat"
                 onClick={(e) => {
                   e.preventDefault();
-                  setWelcomeFlowComplete();
+                  clientSetWelcomeFlowComplete();
                   router.push("/chat");
                   setIsHidden(true);
                 }}