diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index 17a66e84e055..5a37d4966051 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -6,7 +6,8 @@ import {ScrollView, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import Button from '@components/Button';
-import Form from '@components/Form';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
@@ -141,7 +142,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                 </View>
             )}
             {!maxAttemptsReached && state === BankAccount.STATE.PENDING && (
-                <Form
+                <FormProvider
                     formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
                     submitButtonText={translate('validationStep.buttonText')}
                     onSubmit={submit}
@@ -153,7 +154,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                         <Text style={[styles.mb2]}>{translate('validationStep.descriptionCTA')}</Text>
                     </View>
                     <View style={[styles.mv5]}>
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             inputID="amount1"
                             shouldSaveDraft
                             containerStyles={[styles.mb1]}
@@ -161,7 +163,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             inputMode={CONST.INPUT_MODE.DECIMAL}
                             role={CONST.ACCESSIBILITY_ROLE.TEXT}
                         />
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             inputID="amount2"
                             shouldSaveDraft
                             containerStyles={[styles.mb1]}
@@ -169,7 +172,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             inputMode={CONST.INPUT_MODE.DECIMAL}
                             role={CONST.ACCESSIBILITY_ROLE.TEXT}
                         />
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             shouldSaveDraft
                             inputID="amount3"
                             containerStyles={[styles.mb1]}
@@ -183,7 +187,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             <Enable2FAPrompt />
                         </View>
                     )}
-                </Form>
+                </FormProvider>
             )}
             {isVerifying && (
                 <ScrollView style={[styles.flex1]}>