diff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
index 288627c6335208f2f8bb325db6d48216a8497a84..9e43aba4081b871695975fc08197e1186dc9263c 100644
--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
@@ -14,7 +14,11 @@ export interface SettingsPageProps {
   onStepShow: (step: number) => void;
 }
 
-const SettingsPage = ({ step, onStepShow }: SettingsPageProps): JSX.Element => {
+const SettingsPage = ({
+  step,
+  onStepShow,
+  ...props
+}: SettingsPageProps): JSX.Element => {
   useEffect(() => {
     onStepShow(step);
   }, [step, onStepShow]);
@@ -25,13 +29,13 @@ const SettingsPage = ({ step, onStepShow }: SettingsPageProps): JSX.Element => {
         <LogoIcon height={51} />
       </PageHeader>
       <PageBody>
-        <LanguageStep />
-        <UserStep />
-        <DatabaseStep />
-        <DatabaseHelp />
-        <PreferencesStep />
-        <CompletedStep />
-        <SetupHelp />
+        <LanguageStep {...props} />
+        <UserStep {...props} />
+        <DatabaseStep {...props} />
+        <DatabaseHelp {...props} />
+        <PreferencesStep {...props} />
+        <CompletedStep {...props} />
+        <SetupHelp {...props} />
       </PageBody>
     </div>
   );
diff --git a/frontend/src/metabase/setup/components/Setup/Setup.tsx b/frontend/src/metabase/setup/components/Setup/Setup.tsx
index 8ae142cfda1e47a281327b06a83e12433d27ac4c..e5dcd69d9f0da4da2e32837acce4007d2dc56949 100644
--- a/frontend/src/metabase/setup/components/Setup/Setup.tsx
+++ b/frontend/src/metabase/setup/components/Setup/Setup.tsx
@@ -6,11 +6,11 @@ export interface SetupProps {
   isWelcome: boolean;
 }
 
-const Setup = ({ isWelcome }: SetupProps): JSX.Element => {
+const Setup = ({ isWelcome, ...props }: SetupProps): JSX.Element => {
   if (isWelcome) {
-    return <WelcomePage />;
+    return <WelcomePage {...props} />;
   } else {
-    return <SettingsPage />;
+    return <SettingsPage {...props} />;
   }
 };