diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
index 160964df..d66f4725 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx
@@ -194,7 +194,7 @@ const Wallet = ({ name: SCREEN_KEY }) => {
               <FormRenderer
                 save={wizardSave}
                 elements={editingSchema.elements}
-                validationSchema={editingSchema.validationSchema}
+                validationSchema={editingSchema.getValidationSchema(accounts[editingSchema.code])}
                 value={accounts[editingSchema.code]}
               />
             </Modal>
diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.jsx b/new-lamassu-admin/src/pages/Wallet/Wizard.jsx
index 361b6d84..ebb91549 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wizard.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/Wizard.jsx
@@ -135,6 +135,7 @@ const Wizard = ({
           fiatCurrency={fiatCurrency}
           error={error}
           step={step}
+          accounts={accounts}
           maxSteps={MAX_STEPS}
           lastStep={lastStep}
           isLastStep={isLastStep}
diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
index dddc8f85..3070b1f4 100644
--- a/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
+++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx
@@ -62,6 +62,7 @@ const WizardStep = ({
   maxSteps,
   lastStep,
   isLastStep,
+  accounts,
   onContinue,
   fiatCurrency,
   filled,
@@ -177,7 +178,7 @@ const WizardStep = ({
         <FormRenderer
           save={it => innerContinue({ [type]: form.code }, { [form.code]: it })}
           elements={schemas[form.code].elements}
-          validationSchema={schemas[form.code].validationSchema}
+          validationSchema={schemas[form.code].getValidationSchema(accounts[form.code])}
           value={getValue(form.code)}
           buttonLabel={label}
         />
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
index 7a4ea847..d9a3095a 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx
@@ -126,7 +126,7 @@ const Mailgun = () => {
             value={accounts.mailgun}
             save={saveAccount}
             elements={mailgunSchema.elements}
-            validationSchema={mailgunSchema.validationSchema}
+            validationSchema={mailgunSchema.getValidationSchema(accounts.mailgun)}
             buttonLabel={'Save'}
           />
         </>
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
index 7107b726..f4e1dbac 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx
@@ -138,7 +138,7 @@ function Twilio({ doContinue }) {
               save={save}
               value={accounts.twilio}
               elements={twilio.elements}
-              validationSchema={twilio.validationSchema}
+              validationSchema={twilio.getValidationSchema(accounts.twilio)}
               buttonLabel={'Continue'}
               buttonClass={classes.formButton}
             />
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
index 28a347f9..2c82b1e7 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx
@@ -118,7 +118,7 @@ const ChooseExchange = ({ data: currentData, addData }) => {
             value={accounts[selected]}
             save={saveExchange(selected)}
             elements={schema[selected].elements}
-            validationSchema={schema[selected].validationSchema}
+            validationSchema={schema[selected].getValidationSchema(accounts[selected])}
             buttonLabel={'Continue'}
             buttonClass={classes.formButton}
           />