diff --git a/packages/app-rfi/src/components/appVariants/index.js b/packages/app-rfi/src/components/appVariants/index.js
index f02d76e8e9..97e6f70475 100644
--- a/packages/app-rfi/src/components/appVariants/index.js
+++ b/packages/app-rfi/src/components/appVariants/index.js
@@ -105,7 +105,7 @@ const variants = {
     >
       <h4>Step 2 of 2</h4>
       <h2>About me</h2>
-      <EmailAddress gaData={gaData2Of2} />
+      <EmailAddress autoFocus gaData={gaData2Of2} />
       <FirstName gaData={gaData2Of2} />
       <LastName gaData={gaData2Of2} />
       <Phone gaData={gaData2Of2} />
diff --git a/packages/app-rfi/src/components/steps/questions/EmailAddress.js b/packages/app-rfi/src/components/steps/questions/EmailAddress.js
index b70569f949..1975f92933 100644
--- a/packages/app-rfi/src/components/steps/questions/EmailAddress.js
+++ b/packages/app-rfi/src/components/steps/questions/EmailAddress.js
@@ -7,7 +7,8 @@ import { PII_VALUE } from "../../../core/utils/constants";
 /**
  * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props
  */
-export const EmailAddress = ({ gaData }) => {
+// eslint-disable-next-line react/prop-types
+export const EmailAddress = ({ gaData, autoFocus }) => {
   const label = "Email Address";
   const name = "EmailAddress";
 
@@ -18,6 +19,7 @@ export const EmailAddress = ({ gaData }) => {
       name={name}
       requiredIcon
       required
+      autoFocus={autoFocus}
       onBlur={e =>
         trackGAEvent({
           ...gaData,