diff --git a/app/controllers/invite_to_controller.rb b/app/controllers/invite_to_controller.rb
index 9fd5f1e73..63ebcd6ca 100644
--- a/app/controllers/invite_to_controller.rb
+++ b/app/controllers/invite_to_controller.rb
@@ -1,12 +1,11 @@
 # Invite to X controller
 class InviteToController < ApplicationController
   def index
-    # TODO: uncomment when backend token updated
-    # decoded_params = decode_token(params[:t])
-    # if decoded_params.is_a?(String)
-    #   redirect_to decoded_params
-    #   return
-    # end
+    decoded_params = decode_token(params[:t])
+    if decoded_params.is_a?(String)
+      redirect_to decoded_params
+      return
+    end
     decoded_params ||= params
     @invite_to_props = props(decoded_params)
     # Get file upload URL for application
diff --git a/app/javascript/__tests__/api/inviteToApplyApiService.test.ts b/app/javascript/__tests__/api/inviteToApiService.test.ts
similarity index 87%
rename from app/javascript/__tests__/api/inviteToApplyApiService.test.ts
rename to app/javascript/__tests__/api/inviteToApiService.test.ts
index 176820451..31306c74b 100644
--- a/app/javascript/__tests__/api/inviteToApplyApiService.test.ts
+++ b/app/javascript/__tests__/api/inviteToApiService.test.ts
@@ -1,5 +1,6 @@
 import { post } from "../../api/apiService"
 import { recordResponse } from "../../api/inviteToApiService"
+import { INVITE_TO_X } from "../../modules/constants"
 
 jest.mock("../../api/apiService", () => ({
   post: jest.fn(),
@@ -16,7 +17,7 @@ describe("inviteToApiService", () => {
         deadline: "2099-01-01",
         action: "submit",
         response: "submit",
-        type: "I2A",
+        type: INVITE_TO_X.APPLY,
       }
       await recordResponse(record)
       expect(post).toHaveBeenCalled()
diff --git a/app/javascript/__tests__/pages/invite-to-apply.test.tsx b/app/javascript/__tests__/pages/invite-to-apply.test.tsx
index e6b7c5faa..55fb7abee 100644
--- a/app/javascript/__tests__/pages/invite-to-apply.test.tsx
+++ b/app/javascript/__tests__/pages/invite-to-apply.test.tsx
@@ -9,6 +9,7 @@ import { localizedFormat } from "../../util/languageUtil"
 import { getListing } from "../../api/listingApiService"
 import { recordResponse } from "../../api/inviteToApiService"
 import { ConfigContext } from "../../lib/ConfigContext"
+import { INVITE_TO_X } from "../../modules/constants"
 
 jest.mock("../../api/listingApiService")
 jest.mock("../../api/inviteToApiService", () => ({
@@ -98,7 +99,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             act: "contact",
             deadline: mockPastDeadline,
           }}
@@ -117,7 +118,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "no",
             appId: "0000",
@@ -145,7 +146,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "contact",
             appId: "0000",
@@ -182,7 +183,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockPastDeadline,
             act: "yes",
             appId: "0000",
@@ -197,7 +198,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "yes",
           }}
@@ -217,7 +218,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "yes",
             appId: "a0o123",
@@ -242,7 +243,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "yes",
             appId: "a0o123",
@@ -264,7 +265,7 @@ describe("Invite to Apply", () => {
         <InviteToPage
           assetPaths={"/"}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
             deadline: mockFutureDeadline,
             act: "yes",
           }}
@@ -285,7 +286,7 @@ describe("Invite to Apply", () => {
           assetPaths={"/"}
           documentsPath={true}
           urlParams={{
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
           }}
         />
       )
diff --git a/app/javascript/__tests__/pages/invite-to-interview.test.tsx b/app/javascript/__tests__/pages/invite-to-interview.test.tsx
index 1b121757d..ebdd19133 100644
--- a/app/javascript/__tests__/pages/invite-to-interview.test.tsx
+++ b/app/javascript/__tests__/pages/invite-to-interview.test.tsx
@@ -8,6 +8,7 @@ import { renderAndLoadAsync } from "../__util__/renderUtils"
 import { ConfigContext } from "../../lib/ConfigContext"
 import { getListing } from "../../api/listingApiService"
 import { recordResponse } from "../../api/inviteToApiService"
+import { INVITE_TO_X } from "../../modules/constants"
 
 jest.mock("../../api/listingApiService")
 jest.mock("../../api/inviteToApiService", () => ({
@@ -89,7 +90,7 @@ describe("Invite to Interview", () => {
       <InviteToPage
         assetPaths={"/"}
         urlParams={{
-          type: "I2I",
+          type: INVITE_TO_X.INTERVIEW,
         }}
         documentsPath={true}
       />
@@ -104,7 +105,7 @@ describe("Invite to Interview", () => {
       <InviteToPage
         assetPaths={"/"}
         urlParams={{
-          type: "I2I",
+          type: INVITE_TO_X.INTERVIEW,
           act: "yes",
           deadline: "2030-10-10",
           appId: "test-id",
@@ -120,7 +121,7 @@ describe("Invite to Interview", () => {
       <InviteToPage
         assetPaths={"/"}
         urlParams={{
-          type: "I2I",
+          type: INVITE_TO_X.INTERVIEW,
           act: "yes",
           deadline: "2020-10-10",
           appId: "test-id",
@@ -135,7 +136,7 @@ describe("Invite to Interview", () => {
       <InviteToPage
         assetPaths={"/"}
         urlParams={{
-          type: "I2I",
+          type: INVITE_TO_X.INTERVIEW,
           act: "yes",
           deadline: "2030-10-10",
           appId: "test-id",
@@ -150,7 +151,7 @@ describe("Invite to Interview", () => {
       <InviteToPage
         assetPaths={"/"}
         urlParams={{
-          type: "I2I",
+          type: INVITE_TO_X.INTERVIEW,
           deadline: "2030-10-10",
           act: "yes",
           appId: "test-id",
@@ -163,4 +164,47 @@ describe("Invite to Interview", () => {
     await userEvent.click(button)
     expect(recordResponse).toHaveBeenCalled()
   })
+
+  it("shows the withdrawn page when the action is no", async () => {
+    await renderWithContext(
+      <InviteToPage
+        assetPaths={"/"}
+        urlParams={{
+          type: INVITE_TO_X.INTERVIEW,
+          act: "no",
+          deadline: "2030-10-10",
+          appId: "test-id",
+        }}
+      />
+    )
+    expect(screen.getByText(t("inviteToInterviewPage.withdrawn.title"))).toBeInTheDocument()
+  })
+  it("shows the withdrawn page without the body when the deadline is passed", async () => {
+    await renderWithContext(
+      <InviteToPage
+        assetPaths={"/"}
+        urlParams={{
+          type: INVITE_TO_X.INTERVIEW,
+          act: "no",
+          deadline: "2020-10-10",
+          appId: "test-id",
+        }}
+      />
+    )
+    expect(screen.queryByText(t("inviteToInterviewPage.withdrawn.body"))).not.toBeInTheDocument()
+  })
+  it("shows the waitlist page when the action is contact", async () => {
+    await renderWithContext(
+      <InviteToPage
+        assetPaths={"/"}
+        urlParams={{
+          type: INVITE_TO_X.INTERVIEW,
+          act: "contact",
+          deadline: "2030-10-10",
+          appId: "test-id",
+        }}
+      />
+    )
+    expect(screen.getByText(t("inviteToInterviewPage.waitlist.title"))).toBeInTheDocument()
+  })
 })
diff --git a/app/javascript/modules/constants.tsx b/app/javascript/modules/constants.tsx
index 4fb2561a8..2cb387e78 100644
--- a/app/javascript/modules/constants.tsx
+++ b/app/javascript/modules/constants.tsx
@@ -288,3 +288,8 @@ export const RELATIONSHIP_OPTIONS = [
   { value: "Friend", label: "label.friend" },
   { value: "Other", label: "label.Other" },
 ]
+
+export enum INVITE_TO_X {
+  APPLY = "I2A",
+  INTERVIEW = "I2I",
+}
diff --git a/app/javascript/pages/inviteTo/InviteToContactMeLater.tsx b/app/javascript/pages/inviteTo/InviteToContactMeLater.tsx
new file mode 100644
index 000000000..963902d98
--- /dev/null
+++ b/app/javascript/pages/inviteTo/InviteToContactMeLater.tsx
@@ -0,0 +1,82 @@
+import React from "react"
+import { t, LoadingOverlay } from "@bloom-housing/ui-components"
+import { Card, Heading } from "@bloom-housing/ui-seeds"
+import styles from "./invite-to.module.scss"
+import { renderMarkup, localizedFormat } from "../../util/languageUtil"
+import RailsSaleListing from "../../api/types/rails/listings/RailsSaleListing"
+import FormLayout from "../../layouts/FormLayout"
+import InviteToApplyHeader from "./InviteToHeader"
+import InviteToLeasingAgentInfo from "./InviteToLeasingAgentInfo"
+import { INVITE_TO_X } from "../../modules/constants"
+
+interface InviteToContactMeLaterProps {
+  type: INVITE_TO_X
+  listing: RailsSaleListing | null
+  deadline: string
+  submitPreviewLink: string
+}
+
+const InviteToContactMeLater = ({
+  type,
+  listing,
+  deadline,
+  submitPreviewLink,
+}: InviteToContactMeLaterProps) => {
+  return (
+    <FormLayout>
+      <LoadingOverlay isLoading={!listing}>
+        <InviteToApplyHeader listing={listing} />
+        <Card className={styles.responseCard}>
+          <Card.Header className={styles.responseHeader} divider="flush">
+            <Heading priority={2} size="2xl" className={styles.responseHeading}>
+              {type === INVITE_TO_X.APPLY
+                ? t("inviteToApplyPage.contact.title", {
+                    listingName: listing?.Building_Name_for_Process,
+                  })
+                : t("inviteToInterviewPage.waitlist.title")}
+            </Heading>
+            <p className={styles.responseSubtitle}>
+              {type === INVITE_TO_X.APPLY && t("inviteToApplyPage.contact.subtitle")}
+              {type === INVITE_TO_X.INTERVIEW &&
+                renderMarkup(
+                  `${t("inviteToInterviewPage.waitlist.subtitle", {
+                    listingName: listing?.Building_Name_for_Process,
+                    link: `/listings/${listing?.Id}`,
+                  })}\n\n${t("inviteToInterviewPage.waitlist.p1")}`,
+                  "<strong></strong><a></a>"
+                )}
+            </p>
+          </Card.Header>
+          <Card.Section className={styles.responseSection}>
+            <Heading priority={3} size="xl" className={styles.responseHeading}>
+              {t("inviteToApplyPage.leasingAgent.p1")}
+            </Heading>
+            <p>{t("inviteToApplyPage.leasingAgent.p2")}</p>
+            <p>{t("inviteToApplyPage.leasingAgent.p3")}</p>
+            <InviteToLeasingAgentInfo listing={listing} />
+            {type === INVITE_TO_X.APPLY &&
+              renderMarkup(
+                t("inviteToApplyPage.submitYourInfo", {
+                  listingName: listing?.Building_Name_for_Process,
+                  link: submitPreviewLink,
+                  deadline: localizedFormat(deadline, "ll"),
+                }),
+                "<strong></strong><a></a>"
+              )}
+            {type === INVITE_TO_X.INTERVIEW &&
+              renderMarkup(
+                t("inviteToInterviewPage.waitlist.body", {
+                  listingName: listing?.Building_Name_for_Process,
+                  link: submitPreviewLink,
+                  deadline: localizedFormat(deadline, "ll"),
+                }),
+                "<strong></strong><a></a>"
+              )}
+          </Card.Section>
+        </Card>
+      </LoadingOverlay>
+    </FormLayout>
+  )
+}
+
+export default InviteToContactMeLater
diff --git a/app/javascript/pages/inviteTo/InviteToLayout.tsx b/app/javascript/pages/inviteTo/InviteToLayout.tsx
index 664128d60..14df846e3 100644
--- a/app/javascript/pages/inviteTo/InviteToLayout.tsx
+++ b/app/javascript/pages/inviteTo/InviteToLayout.tsx
@@ -12,6 +12,7 @@ import {
 import styles from "./invite-to.module.scss"
 import InviteToLeasingAgentInfo from "./InviteToLeasingAgentInfo"
 import Layout from "../../layouts/Layout"
+import { INVITE_TO_X } from "../../modules/constants"
 
 const InviteToHeader = ({
   listing,
@@ -40,9 +41,9 @@ const DeadlineBanner = ({
 }: {
   deadline: string
   listing: RailsSaleListing
-  type: string
+  type: INVITE_TO_X
 }) => {
-  if (type === "I2A") {
+  if (type === INVITE_TO_X.APPLY) {
     return (
       <Message
         fullwidth
@@ -110,7 +111,7 @@ const InviteToSidebarBlock = ({
 
 interface InviteToLayoutProps {
   listing: RailsSaleListing
-  type: "I2I" | "I2A"
+  type: INVITE_TO_X
   title?: string
   subtitle?: string
   children: React.ReactNode
diff --git a/app/javascript/pages/inviteTo/InviteToWithdrawn.tsx b/app/javascript/pages/inviteTo/InviteToWithdrawn.tsx
new file mode 100644
index 000000000..337329b2c
--- /dev/null
+++ b/app/javascript/pages/inviteTo/InviteToWithdrawn.tsx
@@ -0,0 +1,70 @@
+import React from "react"
+import { t, LoadingOverlay } from "@bloom-housing/ui-components"
+import { Card, Heading } from "@bloom-housing/ui-seeds"
+import styles from "./invite-to.module.scss"
+import { renderMarkup, localizedFormat } from "../../util/languageUtil"
+import RailsSaleListing from "../../api/types/rails/listings/RailsSaleListing"
+import FormLayout from "../../layouts/FormLayout"
+import InviteToApplyHeader from "./InviteToHeader"
+import InviteToLeasingAgentInfo from "./InviteToLeasingAgentInfo"
+import { isDeadlinePassed } from "../../util/listingUtil"
+import { INVITE_TO_X } from "../../modules/constants"
+
+interface InviteToWithdrawnProps {
+  type: INVITE_TO_X
+  listing: RailsSaleListing | null
+  deadline: string
+  submitPreviewLink: string
+}
+
+const InviteToWithdrawn = ({
+  type,
+  listing,
+  deadline,
+  submitPreviewLink,
+}: InviteToWithdrawnProps) => {
+  return (
+    <FormLayout>
+      <LoadingOverlay isLoading={!listing}>
+        <InviteToApplyHeader listing={listing} />
+        <Card className={styles.responseCard}>
+          <Card.Header className={styles.responseHeader} divider="flush">
+            <Heading priority={2} size="2xl" className={styles.responseHeading}>
+              {t("inviteToApplyPage.withdrawn.title")}
+            </Heading>
+          </Card.Header>
+          {!isDeadlinePassed(deadline) && (
+            <Card.Section className={styles.responseSection}>
+              <Heading priority={3} size="xl" className={styles.responseHeading}>
+                {t("inviteToApplyPage.leasingAgent.p1")}
+              </Heading>
+              <p>{t("inviteToApplyPage.leasingAgent.p2")}</p>
+              <p>{t("inviteToApplyPage.leasingAgent.p3")}</p>
+              <InviteToLeasingAgentInfo listing={listing} />
+              {type === INVITE_TO_X.APPLY &&
+                renderMarkup(
+                  `${t("inviteToApplyPage.submitYourInfo", {
+                    listingName: listing?.Building_Name_for_Process,
+                    link: submitPreviewLink,
+                    deadline: localizedFormat(deadline, "ll"),
+                  })}`,
+                  "<strong></strong><a></a>"
+                )}
+              {type === INVITE_TO_X.INTERVIEW &&
+                renderMarkup(
+                  `${t("inviteToInterviewPage.withdrawn.body", {
+                    listingName: listing?.Building_Name_for_Process,
+                    link: submitPreviewLink,
+                    deadline: localizedFormat(deadline, "ll"),
+                  })}`,
+                  "<strong></strong><a></a>"
+                )}
+            </Card.Section>
+          )}
+        </Card>
+      </LoadingOverlay>
+    </FormLayout>
+  )
+}
+
+export default InviteToWithdrawn
diff --git a/app/javascript/pages/inviteTo/invite-to.tsx b/app/javascript/pages/inviteTo/invite-to.tsx
index 39cf21e3c..1269723d5 100644
--- a/app/javascript/pages/inviteTo/invite-to.tsx
+++ b/app/javascript/pages/inviteTo/invite-to.tsx
@@ -5,8 +5,9 @@ import { AppPages, generateSubmitLink } from "../../util/routeUtil"
 import { getListing } from "../../api/listingApiService"
 import { useFeatureFlag, useVariantFlag } from "../../hooks/useFeatureFlag"
 import InviteToDeadlinePassed from "./InviteToDeadlinePassed"
-import InviteToApplyWithdrawn from "./inviteToApply/InviteToApplyWithdrawn"
-import InviteToApplyContactMeLater from "./inviteToApply/InviteToApplyContactMeLater"
+import InviteToWithdrawn from "./InviteToWithdrawn"
+import { INVITE_TO_X } from "../../modules/constants"
+import InviteToContactMeLater from "./InviteToContactMeLater"
 import InviteToApplyNextSteps from "./inviteToApply/InviteToApplyNextSteps"
 import InviteToApplyDocuments from "./inviteToApply/InviteToApplyDocuments"
 import InviteToInterviewDocuments from "./inviteToInterview/InviteToInterviewDocuments"
@@ -16,7 +17,7 @@ import { getPathWithoutLanguagePrefix } from "../../util/languageUtil"
 import { isDeadlinePassed } from "../../util/listingUtil"
 
 interface UrlParams {
-  type?: "I2A" | "I2I"
+  type?: INVITE_TO_X
   deadline?: string
   act?: "yes" | "no" | "contact" | "submit" | "appointment"
   appId?: string
@@ -63,9 +64,16 @@ const InviteToPage = ({
         })()
       : []
   const isI2IEnabled = isI2IEnabledFlag && listing?.Id && enabledListingIds.includes(listing.Id)
+  const previewLink = generateSubmitLink(
+    appId,
+    deadline,
+    listing?.Id,
+    type,
+    submitPreviewLinkTokenParam
+  )
 
   /* I2I - Invite to Interview pages */
-  if (type === "I2I") {
+  if (type === INVITE_TO_X.INTERVIEW) {
     if (!isI2IEnabled) {
       return null
     }
@@ -77,16 +85,11 @@ const InviteToPage = ({
     }
     if (act === "no") {
       return (
-        <InviteToApplyWithdrawn
+        <InviteToWithdrawn
+          type={type}
           listing={listing}
           deadline={deadline}
-          submitPreviewLink={generateSubmitLink(
-            appId,
-            deadline,
-            listing?.Id,
-            type,
-            submitPreviewLinkTokenParam
-          )}
+          submitPreviewLink={previewLink}
         />
       )
     }
@@ -96,19 +99,15 @@ const InviteToPage = ({
     if (isDeadlinePassed(deadline)) return <InviteToDeadlinePassed listing={listing} />
     if (act === "contact") {
       return (
-        <InviteToApplyContactMeLater
+        <InviteToContactMeLater
+          type={type}
           listing={listing}
           deadline={deadline}
-          submitPreviewLink={generateSubmitLink(
-            appId,
-            deadline,
-            listing?.Id,
-            type,
-            submitPreviewLinkTokenParam
-          )}
+          submitPreviewLink={previewLink}
         />
       )
     }
+    return null
   }
 
   /* I2A - Invite to Apply pages */
@@ -130,16 +129,11 @@ const InviteToPage = ({
   }
   if (act === "no") {
     return (
-      <InviteToApplyWithdrawn
+      <InviteToWithdrawn
+        type={type}
         listing={listing}
         deadline={deadline}
-        submitPreviewLink={generateSubmitLink(
-          appId,
-          deadline,
-          listing?.Id,
-          type,
-          submitPreviewLinkTokenParam
-        )}
+        submitPreviewLink={previewLink}
       />
     )
   }
@@ -156,16 +150,11 @@ const InviteToPage = ({
   if (isDeadlinePassed(deadline)) return <InviteToDeadlinePassed listing={listing} />
   if (act === "contact") {
     return (
-      <InviteToApplyContactMeLater
+      <InviteToContactMeLater
+        type={type}
         listing={listing}
         deadline={deadline}
-        submitPreviewLink={generateSubmitLink(
-          appId,
-          deadline,
-          listing?.Id,
-          type,
-          submitPreviewLinkTokenParam
-        )}
+        submitPreviewLink={previewLink}
       />
     )
   }
diff --git a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyContactMeLater.tsx b/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyContactMeLater.tsx
deleted file mode 100644
index 828a2ecc5..000000000
--- a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyContactMeLater.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from "react"
-import { t, LoadingOverlay } from "@bloom-housing/ui-components"
-import { Card, Heading } from "@bloom-housing/ui-seeds"
-import styles from "../invite-to.module.scss"
-import { renderMarkup, localizedFormat } from "../../../util/languageUtil"
-import RailsSaleListing from "../../../api/types/rails/listings/RailsSaleListing"
-import FormLayout from "../../../layouts/FormLayout"
-import InviteToApplyHeader from "../InviteToHeader"
-import InviteToApplyLeasingAgentInfo from "../InviteToLeasingAgentInfo"
-
-interface InviteToApplyContactMeLaterProps {
-  listing: RailsSaleListing | null
-  deadline: string
-  submitPreviewLink: string
-}
-
-const InviteToApplyContactMeLater = ({
-  listing,
-  deadline,
-  submitPreviewLink,
-}: InviteToApplyContactMeLaterProps) => {
-  return (
-    <FormLayout>
-      <LoadingOverlay isLoading={!listing}>
-        <InviteToApplyHeader listing={listing} />
-        <Card className={styles.responseCard}>
-          <Card.Header className={styles.responseHeader} divider="flush">
-            <Heading priority={2} size="2xl" className={styles.responseHeading}>
-              {t("inviteToApplyPage.contact.title", {
-                listingName: listing?.Building_Name_for_Process,
-              })}
-            </Heading>
-            <p className={styles.responseSubtitle}>{t("inviteToApplyPage.contact.subtitle")}</p>
-          </Card.Header>
-          <Card.Section className={styles.responseSection}>
-            <Heading priority={3} size="xl" className={styles.responseHeading}>
-              {t("inviteToApplyPage.leasingAgent.p1")}
-            </Heading>
-            <p>{t("inviteToApplyPage.leasingAgent.p2")}</p>
-            <p>{t("inviteToApplyPage.leasingAgent.p3")}</p>
-            <InviteToApplyLeasingAgentInfo listing={listing} />
-            {renderMarkup(
-              `${t("inviteToApplyPage.submitYourInfo", {
-                listingName: listing?.Building_Name_for_Process,
-                link: submitPreviewLink,
-                deadline: localizedFormat(deadline, "ll"),
-              })}`,
-              "<strong></strong><a></a>"
-            )}
-          </Card.Section>
-        </Card>
-      </LoadingOverlay>
-    </FormLayout>
-  )
-}
-
-export default InviteToApplyContactMeLater
diff --git a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyNextSteps.tsx b/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyNextSteps.tsx
index 375c5def3..0fe469c8d 100644
--- a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyNextSteps.tsx
+++ b/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyNextSteps.tsx
@@ -16,6 +16,7 @@ import InviteToLayout from "../InviteToLayout"
 import { recordResponse } from "../../../api/inviteToApiService"
 import InviteToGetHelp from "../InviteToGetHelp"
 import InviteToLeasingAgentInfo from "../InviteToLeasingAgentInfo"
+import { INVITE_TO_X } from "../../../modules/constants"
 
 interface InviteToApplyNextStepsProps {
   listing: RailsSaleListing | null
@@ -71,7 +72,7 @@ const WhatToDo = ({
             deadline,
             action: "submit",
             response: "submit",
-            type: "I2A",
+            type: INVITE_TO_X.APPLY,
           })
         }
         setIsSubmitting(false)
@@ -202,7 +203,7 @@ const InviteToApplyNextSteps = ({
   return (
     <InviteToLayout
       listing={listing}
-      type="I2A"
+      type={INVITE_TO_X.APPLY}
       title={t("inviteToApplyPage.submitYourInfo.title", { listingName: titleName })}
       headerText="inviteToApplyPage.submitYourInfo.p1"
       sidebarText="inviteToApplyPage.submitYourInfo.sidebar"
diff --git a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyWithdrawn.tsx b/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyWithdrawn.tsx
deleted file mode 100644
index 8d29dc4d3..000000000
--- a/app/javascript/pages/inviteTo/inviteToApply/InviteToApplyWithdrawn.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from "react"
-import { t, LoadingOverlay } from "@bloom-housing/ui-components"
-import { Card, Heading } from "@bloom-housing/ui-seeds"
-import styles from "../invite-to.module.scss"
-import { renderMarkup, localizedFormat } from "../../../util/languageUtil"
-import RailsSaleListing from "../../../api/types/rails/listings/RailsSaleListing"
-import FormLayout from "../../../layouts/FormLayout"
-import InviteToApplyHeader from "../InviteToHeader"
-import InviteToApplyLeasingAgentInfo from "../InviteToLeasingAgentInfo"
-import { isDeadlinePassed } from "../../../util/listingUtil"
-
-interface InviteToApplyWithdrawnProps {
-  listing: RailsSaleListing | null
-  deadline: string
-  submitPreviewLink: string
-}
-
-const InviteToApplyWithdrawn = ({
-  listing,
-  deadline,
-  submitPreviewLink,
-}: InviteToApplyWithdrawnProps) => {
-  return (
-    <FormLayout>
-      <LoadingOverlay isLoading={!listing}>
-        <InviteToApplyHeader listing={listing} />
-        <Card className={styles.responseCard}>
-          <Card.Header className={styles.responseHeader} divider="flush">
-            <Heading priority={2} size="2xl" className={styles.responseHeading}>
-              {t("inviteToApplyPage.withdrawn.title")}
-            </Heading>
-          </Card.Header>
-          {!isDeadlinePassed(deadline) && (
-            <Card.Section className={styles.responseSection}>
-              <Heading priority={3} size="xl" className={styles.responseHeading}>
-                {t("inviteToApplyPage.leasingAgent.p1")}
-              </Heading>
-              <p>{t("inviteToApplyPage.leasingAgent.p2")}</p>
-              <p>{t("inviteToApplyPage.leasingAgent.p3")}</p>
-              <InviteToApplyLeasingAgentInfo listing={listing} />
-              {renderMarkup(
-                `${t("inviteToApplyPage.submitYourInfo", {
-                  listingName: listing?.Building_Name_for_Process,
-                  link: submitPreviewLink,
-                  deadline: localizedFormat(deadline, "ll"),
-                })}`,
-                "<strong></strong><a></a>"
-              )}
-            </Card.Section>
-          )}
-        </Card>
-      </LoadingOverlay>
-    </FormLayout>
-  )
-}
-
-export default InviteToApplyWithdrawn
diff --git a/app/javascript/pages/inviteTo/inviteToInterview/InviteToInterviewNextSteps.tsx b/app/javascript/pages/inviteTo/inviteToInterview/InviteToInterviewNextSteps.tsx
index 785cd50f9..74f7ecaf9 100644
--- a/app/javascript/pages/inviteTo/inviteToInterview/InviteToInterviewNextSteps.tsx
+++ b/app/javascript/pages/inviteTo/inviteToInterview/InviteToInterviewNextSteps.tsx
@@ -11,6 +11,7 @@ import InviteToLayout from "../InviteToLayout"
 import InviteToGetHelp from "../InviteToGetHelp"
 import InviteToLeasingAgentInfo from "../InviteToLeasingAgentInfo"
 import { recordResponse } from "../../../api/inviteToApiService"
+import { INVITE_TO_X } from "../../../modules/constants"
 
 interface InviteToInterviewNextStepsProps {
   listing: RailsSaleListing
@@ -29,7 +30,7 @@ const WhatToDo = ({
 }) => {
   const [isSubmitting, setIsSubmitting] = useState(false)
   const handleSubmitClick = useCallback(() => {
-    const url = listing?.Leaseup_Appointment_Scheduling_URL
+    const url = listing.Leaseup_Appointment_Scheduling_URL
     void (async () => {
       setIsSubmitting(true)
       window.open(url, "_blank")
@@ -42,7 +43,7 @@ const WhatToDo = ({
             deadline,
             action: "submit",
             response: "submit",
-            type: "I2I",
+            type: INVITE_TO_X.INTERVIEW,
           })
         }
         setIsSubmitting(false)
@@ -83,7 +84,7 @@ const WhatToDo = ({
             variant="primary-outlined"
             onClick={() =>
               window.open(
-                `/${getCurrentLanguage()}/listings/${listing?.Id}/next-steps/documents`,
+                `/${getCurrentLanguage()}/listings/${listing.Id}/next-steps/documents`,
                 "_blank"
               )
             }
@@ -144,7 +145,7 @@ const InviteToInterviewNextSteps = ({
   return (
     <InviteToLayout
       listing={listing}
-      type={"I2I"}
+      type={INVITE_TO_X.INTERVIEW}
       subtitle={t("inviteToInterviewPage.submitYourInfo.subtitle")}
       getAssetPath={getAssetPath}
       headerText="inviteToInterviewPage.submitYourInfo.seeApartment"
diff --git a/app/javascript/util/listingUtil.ts b/app/javascript/util/listingUtil.ts
index c4e732ccc..81e702700 100644
--- a/app/javascript/util/listingUtil.ts
+++ b/app/javascript/util/listingUtil.ts
@@ -760,7 +760,7 @@ export const getSeniorBuildingAgeRequirement = (
   return { entireHousehold, minimumAge }
 }
 
-// I2A deadlines are passed in as just a date (i.e. "2100-01-01") without a time or timezone
+// I2X deadlines are passed in as just a date (i.e. "2100-01-01") without a time or timezone
 // We know that the deadline should pass at midnight Pacific Time on the given date
 export const isDeadlinePassed = (deadline: string) => {
   // Parse deadline as end of day in Pacific Time
diff --git a/app/javascript/util/routeUtil.ts b/app/javascript/util/routeUtil.ts
index 57e8bb6b6..d07cfaab6 100644
--- a/app/javascript/util/routeUtil.ts
+++ b/app/javascript/util/routeUtil.ts
@@ -1,3 +1,4 @@
+import { INVITE_TO_X } from "../modules/constants"
 import {
   getCurrentLanguage,
   getPathWithoutLanguagePrefix,
@@ -160,7 +161,7 @@ export const generateSubmitLink = (
   appId: string,
   deadline: string,
   listingId: string,
-  type: string,
+  type: INVITE_TO_X,
   submitPreviewLinkTokenParam?: string
 ) => {
   const submitLinkQueryStr = submitPreviewLinkTokenParam
diff --git a/app/services/dahlia_backend/message_service.rb b/app/services/dahlia_backend/message_service.rb
index 3371cfda9..fea02e121 100644
--- a/app/services/dahlia_backend/message_service.rb
+++ b/app/services/dahlia_backend/message_service.rb
@@ -73,14 +73,14 @@ def send_invite_to_response(_deadline, _app_id, _application_number, _response,
                                                          _application_number, _app_id, _action)
       return if fields.nil?
 
-      log_info("Prepared fields for Invite to Apply response: #{fields.inspect}")
+      log_info("Prepared fields for I2X response: #{fields.inspect}")
 
       endpoint = get_response_endpoint(_action, _response)
       return log_error("Invalid action type: #{_action}", nil) unless endpoint
 
       send_message(endpoint, fields)
     rescue StandardError => e
-      log_error('Error sending Invite to Apply', e)
+      log_error('Error sending I2X response', e)
       nil
     end
 
diff --git a/spec/controllers/invite_to_controller_spec.rb b/spec/controllers/invite_to_controller_spec.rb
index e8ae6a3ef..712406317 100644
--- a/spec/controllers/invite_to_controller_spec.rb
+++ b/spec/controllers/invite_to_controller_spec.rb
@@ -131,17 +131,16 @@
         expect(assigns(:invite_to_props)).to have_key(:submitPreviewLinkTokenParam)
       end
 
-      # TODO: update deprecated I2A pilot 
-      # it 'redirects to the listing details page if token is blank' do
-      #   get :index, params: { id: listing_id }
-      #   expect(response).to redirect_to("/listings/#{listing_id}")
-      # end
+      it 'redirects to the listing details page if token is blank' do
+        get :index, params: { id: listing_id }
+        expect(response).to redirect_to("/listings/#{listing_id}")
+      end
 
-      # it 'redirects to the listing details page if token is invalid' do
-      #   allow(JWT).to receive(:decode).and_raise(JWT::DecodeError)
-      #   get :index, params: { id: listing_id, t: 'invalid_test_token' }
-      #   expect(response).to redirect_to('/')
-      # end
+      it 'redirects to the listing details page if token is invalid' do
+        allow(JWT).to receive(:decode).and_raise(JWT::DecodeError)
+        get :index, params: { id: listing_id, t: 'invalid_test_token' }
+        expect(response).to redirect_to('/')
+      end
     end
   end