diff --git a/lib/new-admin/config/accounts.js b/lib/new-admin/config/accounts.js
index 3fe0fa7c..9ab0476c 100644
--- a/lib/new-admin/config/accounts.js
+++ b/lib/new-admin/config/accounts.js
@@ -49,7 +49,7 @@ const ALL_ACCOUNTS = [
   { code: 'mock-id-verify', display: 'Mock ID verifier', class: ID_VERIFIER, dev: true },
   { code: 'twilio', display: 'Twilio', class: SMS },
   { code: 'mailgun', display: 'Mailgun', class: EMAIL },
-  { code: 'none', display: 'None', class: ZERO_CONF, cryptos: [BTC, ZEC, LTC, DASH, BCH, ETH, XMR] },
+  { code: 'none', display: 'None', class: ZERO_CONF, cryptos: ALL_CRYPTOS },
   { code: 'blockcypher', display: 'Blockcypher', class: ZERO_CONF, cryptos: [BTC] },
   { code: 'mock-zero-conf', display: 'Mock 0-conf', class: ZERO_CONF, cryptos: ALL_CRYPTOS, dev: true },
   { code: 'ciphertrace', display: 'CipherTrace', class: WALLET_SCORING, cryptos: [BTC, ETH, LTC, BCH] },
diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.js
index 6b7cb824..826955a0 100644
--- a/new-lamassu-admin/src/pages/Cashout/Wizard.js
+++ b/new-lamassu-admin/src/pages/Cashout/Wizard.js
@@ -17,7 +17,7 @@ const MODAL_WIDTH = 554
 const MODAL_HEIGHT = 520
 
 const Wizard = ({ machine, locale, onClose, save, error }) => {
-  const LAST_STEP = machine.numberOfCassettes + 2
+  const LAST_STEP = machine.numberOfCassettes + 1
   const [{ step, config }, setState] = useState({
     step: 0,
     config: { active: true }
@@ -46,34 +46,20 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
     })
   }
 
-  const steps = []
-
-  R.until(
-    R.gt(R.__, machine.numberOfCassettes),
-    it => {
-      steps.push({
-        type: `cassette${it}`,
-        display: `Cassette ${it}`,
-        component: Autocomplete,
-        inputProps: {
-          options: R.map(it => ({ code: it, display: it }))(options),
-          labelProp: 'display',
-          valueProp: 'code'
-        }
-      })
-      return R.add(1, it)
-    },
-    1
+  const steps = R.map(
+    it => ({
+      type: `cassette${it}`,
+      display: `Cassette ${it}`,
+      component: Autocomplete,
+      inputProps: {
+        options: R.map(it => ({ code: it, display: it }), options),
+        labelProp: 'display',
+        valueProp: 'code'
+      }
+    }),
+    R.range(1, machine.numberOfCassettes + 1)
   )
 
-  steps.push({
-    type: 'zeroConfLimit',
-    display: '0-conf Limit',
-    schema: Yup.object().shape({
-      zeroConfLimit: Yup.number().required()
-    })
-  })
-
   const schema = () =>
     Yup.object().shape({
       cassette1: Yup.number().required(),
@@ -113,7 +99,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
           name={machine.name}
           numberOfCassettes={machine.numberOfCassettes}
           error={error}
-          lastStep={isLastStep}
+          isLastStep={isLastStep}
           steps={steps}
           fiatCurrency={locale.fiatCurrency}
           options={options}
diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.js b/new-lamassu-admin/src/pages/Cashout/WizardStep.js
index f292503b..c4694c35 100644
--- a/new-lamassu-admin/src/pages/Cashout/WizardStep.js
+++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.js
@@ -44,7 +44,7 @@ const WizardStep = ({
   step,
   schema,
   error,
-  lastStep,
+  isLastStep,
   onContinue,
   steps,
   fiatCurrency,
@@ -53,7 +53,7 @@ const WizardStep = ({
 }) => {
   const classes = useStyles()
 
-  const label = lastStep ? 'Finish' : 'Next'
+  const label = isLastStep ? 'Finish' : 'Next'
 
   return (
     <>
@@ -62,7 +62,7 @@ const WizardStep = ({
         <Stepper steps={steps.length + 1} currentStep={step} />
       </div>
 
-      {step <= numberOfCassettes && (
+      {!isLastStep && (
         <Formik
           validateOnBlur={false}
           validateOnChange={false}
@@ -121,46 +121,7 @@ const WizardStep = ({
         </Formik>
       )}
 
-      {step === numberOfCassettes + 1 && (
-        <Formik
-          validateOnBlur={false}
-          validateOnChange={false}
-          onSubmit={onContinue}
-          initialValues={{ zeroConfLimit: '' }}
-          enableReinitialize
-          validationSchema={steps[step - 1].schema}>
-          <Form>
-            <div className={classes.thirdStepHeader}>
-              <div className={classes.step}>
-                <H4 className={classes.edit}>Edit 0-conf Limit</H4>
-
-                <Label1>Choose a limit</Label1>
-                <div className={classes.bill}>
-                  <Field
-                    className={classes.billInput}
-                    type="text"
-                    size="lg"
-                    autoFocus={true}
-                    component={NumberInput}
-                    fullWidth
-                    decimalPlaces={0}
-                    name={steps[step - 1].type}
-                  />
-                  <Info1 noMargin className={classes.suffix}>
-                    {fiatCurrency}
-                  </Info1>
-                </div>
-              </div>
-            </div>
-
-            <Button className={classes.submit} type="submit">
-              {label}
-            </Button>
-          </Form>
-        </Formik>
-      )}
-
-      {lastStep && (
+      {isLastStep && (
         <div className={classes.disclaimer}>
           <Info2 className={classes.title}>Cash Cassette Bill Count</Info2>
           <P>
diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.js b/new-lamassu-admin/src/pages/Wallet/Wizard.js
index 42f11940..c1f81225 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wizard.js
+++ b/new-lamassu-admin/src/pages/Wallet/Wizard.js
@@ -79,7 +79,10 @@ const Wizard = ({
           }),
           ...zeroConfs
         },
-        { type: 'zeroConfLimit', name: '0-conf limit', ...zeroConfs }
+        {
+          type: 'zeroConfLimit',
+          name: '0-conf limit'
+        }
       ])
     : commonWizardSteps
 
diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.js b/new-lamassu-admin/src/pages/Wallet/WizardStep.js
index 4631046b..54d60429 100644
--- a/new-lamassu-admin/src/pages/Wallet/WizardStep.js
+++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.js
@@ -112,8 +112,7 @@ const WizardStep = ({
           radioClassName={classes.radio}
         />
       )}
-      {/* Hack to support optional 0conf setup */
-      isLastStep && step === maxSteps && (
+      {type === 'zeroConfLimit' && (
         <Formik
           validateOnBlur={false}
           validateOnChange={true}
diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js
index f2653ffd..ae891826 100644
--- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js
+++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js
@@ -70,6 +70,20 @@ const AllSet = ({ data: currentData, doContinue }) => {
     return saveConfig({ variables: { config } })
   }
 
+  const presentableData = R.pipe(
+    R.omit(['coin', 'zeroConf', 'zeroConfLimit']),
+    toNamespace(coin)
+  )(currentData)
+
+  const presentableElements = R.filter(
+    R.pipe(
+      R.prop('name'),
+      R.flip(R.includes)(['zeroConf', 'zeroConfLimit']),
+      R.not()
+    ),
+    getElements(cryptoCurrencies, accountsConfig, null, true)
+  )
+
   return (
     <>
       <H4 className={error && classes.error}>All set</H4>
@@ -82,8 +96,8 @@ const AllSet = ({ data: currentData, doContinue }) => {
         titleLg
         name="All set"
         namespaces={[coin]}
-        data={toNamespace(coin, R.omit('coin', currentData))}
-        elements={getElements(cryptoCurrencies, accountsConfig, true)}
+        data={presentableData}
+        elements={presentableElements}
       />
       <Button size="lg" onClick={save} className={classes.button}>
         Continue