diff --git a/src/components/DatePicker/index.android.js b/src/components/DatePicker/index.android.js
index 77d7bbc705a2..813bf517d08b 100644
--- a/src/components/DatePicker/index.android.js
+++ b/src/components/DatePicker/index.android.js
@@ -39,7 +39,7 @@ class DatePicker extends React.Component {
     }
 
     render() {
-        const dateAsText = this.props.defaultValue ? moment(this.props.defaultValue).format(CONST.DATE.MOMENT_FORMAT_STRING) : '';
+        const dateAsText = this.props.value || this.props.defaultValue ? moment(this.props.value || this.props.defaultValue).format(CONST.DATE.MOMENT_FORMAT_STRING) : '';
 
         return (
             <>
@@ -62,7 +62,7 @@ class DatePicker extends React.Component {
                 />
                 {this.state.isPickerVisible && (
                     <RNDatePicker
-                        value={this.props.defaultValue ? moment(this.props.defaultValue).toDate() : new Date()}
+                        value={this.props.value || this.props.defaultValue ? moment(this.props.value || this.props.defaultValue).toDate() : new Date()}
                         mode="date"
                         onChange={this.setDate}
                         maximumDate={this.props.maximumDate}
diff --git a/src/components/DatePicker/index.ios.js b/src/components/DatePicker/index.ios.js
index a52efd5b1900..1c3bd61ae393 100644
--- a/src/components/DatePicker/index.ios.js
+++ b/src/components/DatePicker/index.ios.js
@@ -23,7 +23,7 @@ class DatePicker extends React.Component {
 
         this.state = {
             isPickerVisible: false,
-            selectedDate: props.defaultValue ? moment(props.defaultValue).toDate() : new Date(),
+            selectedDate: props.value || props.defaultValue ? moment(props.value || props.defaultValue).toDate() : new Date(),
         };
 
         this.showPicker = this.showPicker.bind(this);
@@ -66,7 +66,7 @@ class DatePicker extends React.Component {
     }
 
     render() {
-        const dateAsText = this.props.defaultValue ? moment(this.props.defaultValue).format(CONST.DATE.MOMENT_FORMAT_STRING) : '';
+        const dateAsText = this.props.value || this.props.defaultValue ? moment(this.props.value || this.props.defaultValue).format(CONST.DATE.MOMENT_FORMAT_STRING) : '';
         return (
             <>
                 <TextInput
diff --git a/src/components/DatePicker/index.js b/src/components/DatePicker/index.js
index 79dcd6e12585..9f3c93a50605 100644
--- a/src/components/DatePicker/index.js
+++ b/src/components/DatePicker/index.js
@@ -42,7 +42,7 @@ class DatePicker extends React.Component {
      */
     setDate(text) {
         if (!text) {
-            this.props.onInputChange(null);
+            this.props.onInputChange('');
             return;
         }
 
@@ -79,6 +79,7 @@ class DatePicker extends React.Component {
                 onFocus={this.showDatepicker}
                 label={this.props.label}
                 onInputChange={this.setDate}
+                value={this.props.value}
                 defaultValue={this.defaultValue}
                 placeholder={this.props.placeholder}
                 errorText={this.props.errorText}
diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js
index a5b131922ac9..f6e21955b9b6 100644
--- a/src/pages/ReimbursementAccount/ACHContractStep.js
+++ b/src/pages/ReimbursementAccount/ACHContractStep.js
@@ -231,6 +231,7 @@ class ACHContractStep extends React.Component {
                                         {this.props.translate('beneficialOwnersStep.additionalOwner')}
                                     </Text>
                                     <IdentityForm
+                                        translate={this.props.translate}
                                         style={[styles.mb2]}
                                         onFieldChange={values => this.clearErrorAndSetBeneficialOwnerValues(index, values)}
                                         values={{
diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index 7925133bbf1e..1c06061a44cb 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
+import _ from 'underscore';
 import TextInput from '../../components/TextInput';
 import styles from '../../styles/styles';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import CONST from '../../CONST';
 import DatePicker from '../../components/DatePicker';
 import AddressForm from './AddressForm';
@@ -13,7 +13,7 @@ const propTypes = {
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     /** Callback fired when a field changes. Passes args as {[fieldName]: val} */
-    onFieldChange: PropTypes.func.isRequired,
+    onFieldChange: PropTypes.func,
 
     /** Form values */
     values: PropTypes.shape({
@@ -45,12 +45,39 @@ const propTypes = {
     /** Any errors that can arise from form validation */
     errors: PropTypes.objectOf(PropTypes.bool),
 
-    ...withLocalizePropTypes,
+    /** The map for inputID of the inputs */
+    inputKeys: PropTypes.shape({
+        firstName: PropTypes.string,
+        lastName: PropTypes.string,
+        dob: PropTypes.string,
+        ssnLast4: PropTypes.string,
+        street: PropTypes.string,
+        city: PropTypes.string,
+        state: PropTypes.string,
+        zipCode: PropTypes.string,
+    }),
+
+    /** Saves a draft of the input value when used in a form */
+    shouldSaveDraft: PropTypes.bool,
+
+    /** Returns translated string for given locale and phrase */
+    translate: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
     style: {},
     values: {
+        firstName: undefined,
+        lastName: undefined,
+        street: undefined,
+        city: undefined,
+        state: undefined,
+        zipCode: undefined,
+        dob: undefined,
+        ssnLast4: undefined,
+    },
+    errors: {},
+    inputKeys: {
         firstName: '',
         lastName: '',
         street: '',
@@ -60,7 +87,8 @@ const defaultProps = {
         dob: '',
         ssnLast4: '',
     },
-    errors: {},
+    shouldSaveDraft: false,
+    onFieldChange: () => {},
 };
 
 const IdentityForm = (props) => {
@@ -73,6 +101,8 @@ const IdentityForm = (props) => {
             <View style={[styles.flexRow]}>
                 <View style={[styles.flex2, styles.mr2]}>
                     <TextInput
+                        inputID={props.inputKeys.firstName}
+                        shouldSaveDraft={props.shouldSaveDraft}
                         label={`${props.translate('common.firstName')}`}
                         value={props.values.firstName}
                         onChangeText={value => props.onFieldChange({firstName: value})}
@@ -81,6 +111,8 @@ const IdentityForm = (props) => {
                 </View>
                 <View style={[styles.flex2]}>
                     <TextInput
+                        inputID={props.inputKeys.lastName}
+                        shouldSaveDraft={props.shouldSaveDraft}
                         label={`${props.translate('common.lastName')}`}
                         value={props.values.lastName}
                         onChangeText={value => props.onFieldChange({lastName: value})}
@@ -89,6 +121,8 @@ const IdentityForm = (props) => {
                 </View>
             </View>
             <DatePicker
+                inputID={props.inputKeys.dob}
+                shouldSaveDraft={props.shouldSaveDraft}
                 label={`${props.translate('common.dob')}`}
                 containerStyles={[styles.mt4]}
                 placeholder={props.translate('common.dateFormat')}
@@ -98,6 +132,8 @@ const IdentityForm = (props) => {
                 maximumDate={new Date()}
             />
             <TextInput
+                inputID={props.inputKeys.ssnLast4}
+                shouldSaveDraft={props.shouldSaveDraft}
                 label={`${props.translate('common.ssnLast4')}`}
                 containerStyles={[styles.mt4]}
                 keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
@@ -107,6 +143,8 @@ const IdentityForm = (props) => {
                 maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
             />
             <AddressForm
+                inputKeys={_.omit(props.inputKeys, ['firstName', 'lastName', 'dob', 'ssnLast4'])}
+                shouldSaveDraft={props.shouldSaveDraft}
                 translate={props.translate}
                 streetTranslationKey="common.personalAddress"
                 values={props.values}
@@ -120,4 +158,4 @@ const IdentityForm = (props) => {
 IdentityForm.propTypes = propTypes;
 IdentityForm.defaultProps = defaultProps;
 IdentityForm.displayName = 'IdentityForm';
-export default withLocalize(IdentityForm);
+export default IdentityForm;
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 70e00a46b96e..05fc624d61be 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -221,6 +221,7 @@ class RequestorStep extends React.Component {
                                 ssnLast4: this.state.ssnLast4,
                             }}
                             errors={this.props.reimbursementAccount.errorFields}
+                            translate={this.props.translate}
                         />
                         <CheckboxWithLabel
                             isChecked={this.state.isControllingOfficer}