From 18748e71eee08c8ee447bcce714634eabd85e1b0 Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Wed, 26 Nov 2025 13:42:55 -0500
Subject: [PATCH 1/6] fix: expand Contact Support access to paid customers

---
 src/pageLayout/containers/MainNavigation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pageLayout/containers/MainNavigation.tsx b/src/pageLayout/containers/MainNavigation.tsx
index 94d842993a..b2dce5ffb6 100644
--- a/src/pageLayout/containers/MainNavigation.tsx
+++ b/src/pageLayout/containers/MainNavigation.tsx
@@ -417,7 +417,7 @@ export const MainNavigation: FC = () => {
               />
             )}
           />
-          {CLOUD && isContractCustomer && (
+          {CLOUD && (accountType === 'paid' || accountType === 'contract') && (
             <TreeNav.SubItem
               id="contactSupport"
               label="Contact Support"

From fd73da82ab3df7aa7fff278991265414879ec55d Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Wed, 26 Nov 2025 13:46:01 -0500
Subject: [PATCH 2/6] fix(ui): remove direct Salesforce link from
 SeriesCardinalityIncreaseForm

---
 .../SeriesCardinalityIncreaseForm.tsx         | 20 ++-----------------
 src/cloud/components/WriteLimitOverlay.tsx    | 20 ++-----------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
index b66dea20c6..71b15c52e9 100644
--- a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
+++ b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
@@ -4,20 +4,12 @@ import React, {FC} from 'react'
 // Components
 import {
   Form,
-  Button,
   Heading,
-  ButtonShape,
   InfluxColors,
-  ComponentSize,
-  ComponentColor,
   HeadingElement,
 } from '@influxdata/clockface'
 
 export const SeriesCardinalityIncreaseForm: FC = () => {
-  const handleSubmit = (): void => {
-    window.open(`https://support.influxdata.com/s/login`)
-  }
-
   return (
     <div>
       <Form.Divider lineColor={InfluxColors.Grey15} />
@@ -25,17 +17,9 @@ export const SeriesCardinalityIncreaseForm: FC = () => {
         Request Series Cardinality Limit Increase
       </Heading>
       <p>
-        To request a series cardinality limit increase, please contact our
-        support team.
+        To request a cardinality limit increase, please use the Contact Support
+        option in the Help menu.
       </p>
-      <Button
-        shape={ButtonShape.Default}
-        onClick={handleSubmit}
-        size={ComponentSize.Medium}
-        color={ComponentColor.Primary}
-        className="rate-alert--request-increase-button"
-        text="Submit Request"
-      />
     </div>
   )
 }
diff --git a/src/cloud/components/WriteLimitOverlay.tsx b/src/cloud/components/WriteLimitOverlay.tsx
index 6a32a22b3d..8bdcb599a0 100644
--- a/src/cloud/components/WriteLimitOverlay.tsx
+++ b/src/cloud/components/WriteLimitOverlay.tsx
@@ -14,20 +14,12 @@ import {
 
 import {OverlayContext} from 'src/overlays/components/OverlayController'
 
-// Reporting
-import {event} from 'src/cloud/utils/reporting'
-
 // Design
 import './WriteLimitOverlay.scss'
 
 const WriteLimitOverlay: FC = () => {
   const {onClose} = useContext(OverlayContext)
 
-  const handleSubmit = (): void => {
-    event('limit.requestincrease.writes')
-
-    window.open(`https://support.influxdata.com/s/login`)
-  }
   return (
     <OverlayContainer
       maxWidth={760}
@@ -45,7 +37,7 @@ const WriteLimitOverlay: FC = () => {
             Request Query Write Limit Increase
           </Heading>
           <p>
-            To request a write limit increase, please contact our support team.
+            To request a write limit increase, please use the Contact Support option in the Help menu.
           </p>
         </div>
       </Overlay.Body>
@@ -55,17 +47,9 @@ const WriteLimitOverlay: FC = () => {
           type={ButtonType.Submit}
           size={ComponentSize.Medium}
           color={ComponentColor.Tertiary}
-          text="Cancel"
+          text="Close"
           onClick={onClose}
         />
-        <Button
-          shape={ButtonShape.Default}
-          onClick={handleSubmit}
-          size={ComponentSize.Medium}
-          color={ComponentColor.Primary}
-          className="rate-alert--request-increase-button"
-          text="Submit Request"
-        />
       </Overlay.Footer>
     </OverlayContainer>
   )

From a86b66a7384911278a9044f2226456d4fa02dc82 Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Wed, 26 Nov 2025 14:47:45 -0500
Subject: [PATCH 3/6] chore: remove remaining support link references

---
 src/cloud/constants/index.ts                         |  4 ++--
 .../OrganizationListTab/OrganizationCard.tsx         |  8 ++------
 src/onboarding/containers/LoginPageContents.tsx      |  2 +-
 .../OrgProfileTab/SuspendPaidOrgOverlay.tsx          | 12 +++---------
 src/shared/components/NotFound.tsx                   | 11 ++---------
 src/shared/copy/notifications/categories/limits.ts   |  2 +-
 src/support/components/ConfirmationOverlay.tsx       |  7 ++-----
 7 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/cloud/constants/index.ts b/src/cloud/constants/index.ts
index 9e75065d47..7b11cc4c18 100644
--- a/src/cloud/constants/index.ts
+++ b/src/cloud/constants/index.ts
@@ -1,12 +1,12 @@
 export const RATE_LIMIT_ERROR_STATUS = 429
 
 export const RATE_LIMIT_ERROR_TEXT =
-  'Oops. It looks like you have exceeded the query limits allowed as part of your plan. If you would like to increase your query limits, reach out at support.influxdata.com.'
+  'Oops. It looks like you have exceeded the query limits allowed as part of your plan. If you would like to increase your query limits, please use the Contact Support option in the Help menu.'
 
 export const ASSET_LIMIT_ERROR_STATUS = 403
 
 export const ASSET_LIMIT_ERROR_TEXT =
-  'Oops. It looks like you have exceeded the asset limits allowed as part of your plan. If you would like to increase your limits, reach out at support.influxdata.com.'
+  'Oops. It looks like you have exceeded the asset limits allowed as part of your plan. If you would like to increase your limits, please use the Contact Support option in the Help menu.'
 
 export const REQUEST_TIMEOUT_STATUS = 408
 export const GATEWAY_TIMEOUT_STATUS = 504
diff --git a/src/identity/components/OrganizationListTab/OrganizationCard.tsx b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
index f4a17115a3..0ab6ca8974 100644
--- a/src/identity/components/OrganizationListTab/OrganizationCard.tsx
+++ b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
@@ -24,12 +24,8 @@ interface OrgCardProps {
 
 const tooltipContent = (
   <p>
-    Organizations can be reactivated within 7 days of deletion. Contact support
-    at{' '}
-    <SafeBlankLink href="https://support.influxdata.com/s/login">
-      https://support.influxdata.com/s/login
-    </SafeBlankLink>{' '}
-    to reactivate.
+    Organizations can be reactivated within 7 days of deletion. Please use the
+    Contact Support option in the Help menu to reactivate.
   </p>
 )
 
diff --git a/src/onboarding/containers/LoginPageContents.tsx b/src/onboarding/containers/LoginPageContents.tsx
index 06e5937778..b57691501e 100644
--- a/src/onboarding/containers/LoginPageContents.tsx
+++ b/src/onboarding/containers/LoginPageContents.tsx
@@ -245,7 +245,7 @@ class LoginPageContents extends PureComponent<Props> {
       this.setState({...errors, emailError})
     } else {
       const emailError =
-        'We have been notified of an issue while accessing your account. If this issue persists, please contact support at support.influxdata.com'
+        'We have been notified of an issue while accessing your account. If this issue persists, please use the Contact Support option in the Help menu'
       this.setState({...errors, emailError})
     }
   }
diff --git a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
index d6d7497062..1690d46ecb 100644
--- a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
+++ b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
@@ -63,15 +63,9 @@ const linkStyle = {
 
 const SupportLink = (): JSX.Element => {
   return (
-    <a
-      data-testid="go-to-new-org--link"
-      href="https://support.influxdata.com/s/login"
-      style={linkStyle}
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      https://support.influxdata.com/s/login
-    </a>
+    <span style={linkStyle}>
+      Please use the Contact Support option in the Help menu to reach our support team.
+    </span>
   )
 }
 
diff --git a/src/shared/components/NotFound.tsx b/src/shared/components/NotFound.tsx
index e332f490d7..cc916a5279 100644
--- a/src/shared/components/NotFound.tsx
+++ b/src/shared/components/NotFound.tsx
@@ -78,15 +78,8 @@ const NotFoundNew: FC = () => (
               <div>
                 <span>
                   The webpage you were trying to reach may have been removed or
-                  your access to this page may have expired.&nbsp;
-                  {/* Add rel options to avoid "tabnapping" */}
-                  <a
-                    href="https://support.influxdata.com/s/login"
-                    target="_blank"
-                    rel="noreferrer noopener"
-                  >
-                    Contact InfluxData Support
-                  </a>
+                  your access to this page may have expired. Please use the
+                  Contact Support option in the Help menu.
                 </span>
               </div>
             </FlexBoxChild>
diff --git a/src/shared/copy/notifications/categories/limits.ts b/src/shared/copy/notifications/categories/limits.ts
index d4ca957f2e..937b24ccf4 100644
--- a/src/shared/copy/notifications/categories/limits.ts
+++ b/src/shared/copy/notifications/categories/limits.ts
@@ -52,7 +52,7 @@ export const writeLimitReached = (
 
 export const resourceLimitReached = (resourceName: string): Notification => ({
   ...defaultErrorNotification,
-  message: `Oops. It looks like you have reached the maximum number of ${resourceName} allowed as part of your plan. If you would like to upgrade and remove this restriction, reach out at support.influxdata.com.`,
+  message: `Oops. It looks like you have reached the maximum number of ${resourceName} allowed as part of your plan. If you would like to upgrade and remove this restriction, please use the Contact Support option in the Help menu.`,
   duration: FIVE_SECONDS,
   type: 'resourceLimitReached',
 })
diff --git a/src/support/components/ConfirmationOverlay.tsx b/src/support/components/ConfirmationOverlay.tsx
index c76955478c..e0b4bbe8a5 100644
--- a/src/support/components/ConfirmationOverlay.tsx
+++ b/src/support/components/ConfirmationOverlay.tsx
@@ -65,11 +65,8 @@ const ConfirmationOverlay: FC<OwnProps> = () => {
           account email for a confirmation and follow-up.
         </p>
         <p>
-          For more resources, check out{' '}
-          <SafeBlankLink href="https://support.influxdata.com">
-            {' '}
-            support.influxdata.com{' '}
-          </SafeBlankLink>
+          For more resources, you can contact our support team via the Contact
+          Support option in the Help menu.
         </p>
       </Overlay.Body>
       <Overlay.Footer>

From 7bec878315a66f92c0f554462350c0a589a6236e Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Wed, 26 Nov 2025 16:36:02 -0500
Subject: [PATCH 4/6] feat: trigger modal on support options

---
 .../SeriesCardinalityIncreaseForm.tsx         |  17 +-
 src/cloud/components/WriteLimitOverlay.tsx    |  13 +-
 .../OrganizationListTab/OrganizationCard.tsx  |  27 ++-
 .../OrgProfileTab/SuspendPaidOrgOverlay.tsx   |  31 ++-
 src/pageLayout/containers/MainNavigation.tsx  |   2 +-
 src/shared/components/NotFound.tsx            | 178 ++++++++++--------
 .../components/ConfirmationOverlay.tsx        |  17 +-
 .../components/ContactSupportOverlay.tsx      | 136 +++++++------
 8 files changed, 258 insertions(+), 163 deletions(-)

diff --git a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
index 71b15c52e9..8e1d50b610 100644
--- a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
+++ b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
@@ -1,5 +1,6 @@
 // Libraries
 import React, {FC} from 'react'
+import {useDispatch} from 'react-redux'
 
 // Components
 import {
@@ -9,7 +10,16 @@ import {
   HeadingElement,
 } from '@influxdata/clockface'
 
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
+
 export const SeriesCardinalityIncreaseForm: FC = () => {
+  const dispatch = useDispatch()
+
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
+
   return (
     <div>
       <Form.Divider lineColor={InfluxColors.Grey15} />
@@ -17,8 +27,11 @@ export const SeriesCardinalityIncreaseForm: FC = () => {
         Request Series Cardinality Limit Increase
       </Heading>
       <p>
-        To request a cardinality limit increase, please use the Contact Support
-        option in the Help menu.
+        To request a cardinality limit increase, please{' '}
+        <a href="#" onClick={handleContactSupport}>
+          contact support
+        </a>
+        .
       </p>
     </div>
   )
diff --git a/src/cloud/components/WriteLimitOverlay.tsx b/src/cloud/components/WriteLimitOverlay.tsx
index 8bdcb599a0..d25a26f396 100644
--- a/src/cloud/components/WriteLimitOverlay.tsx
+++ b/src/cloud/components/WriteLimitOverlay.tsx
@@ -1,4 +1,5 @@
 import React, {useContext, FC} from 'react'
+import {useDispatch} from 'react-redux'
 
 import {
   OverlayContainer,
@@ -13,12 +14,18 @@ import {
 } from '@influxdata/clockface'
 
 import {OverlayContext} from 'src/overlays/components/OverlayController'
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 
 // Design
 import './WriteLimitOverlay.scss'
 
 const WriteLimitOverlay: FC = () => {
   const {onClose} = useContext(OverlayContext)
+  const dispatch = useDispatch()
+
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
 
   return (
     <OverlayContainer
@@ -37,7 +44,11 @@ const WriteLimitOverlay: FC = () => {
             Request Query Write Limit Increase
           </Heading>
           <p>
-            To request a write limit increase, please use the Contact Support option in the Help menu.
+            To request a write limit increase, please{' '}
+            <a href="#" onClick={handleContactSupport}>
+              contact support
+            </a>
+            .
           </p>
         </div>
       </Overlay.Body>
diff --git a/src/identity/components/OrganizationListTab/OrganizationCard.tsx b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
index 0ab6ca8974..d6c2c300f5 100644
--- a/src/identity/components/OrganizationListTab/OrganizationCard.tsx
+++ b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
@@ -1,4 +1,5 @@
 import React, {FC} from 'react'
+import {useDispatch} from 'react-redux'
 import {
   FlexBox,
   FlexDirection,
@@ -7,8 +8,8 @@ import {
   ResourceCard,
 } from '@influxdata/clockface'
 
-// Utils
-import {SafeBlankLink} from 'src/utils/SafeBlankLink'
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 
 // Styles
 import './OrganizationCard.scss'
@@ -22,13 +23,6 @@ interface OrgCardProps {
   regionName: string
 }
 
-const tooltipContent = (
-  <p>
-    Organizations can be reactivated within 7 days of deletion. Please use the
-    Contact Support option in the Help menu to reactivate.
-  </p>
-)
-
 export const OrganizationCard: FC<OrgCardProps> = ({
   name,
   isActive,
@@ -37,8 +31,23 @@ export const OrganizationCard: FC<OrgCardProps> = ({
   regionCode,
   regionName,
 }) => {
+  const dispatch = useDispatch()
   const isOrgSuspended = provisioningStatus === 'suspended'
 
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
+
+  const tooltipContent = (
+    <p>
+      Organizations can be reactivated within 7 days of deletion. Please{' '}
+      <a href="#" onClick={handleContactSupport}>
+        contact support
+      </a>{' '}
+      to reactivate.
+    </p>
+  )
+
   return (
     <ResourceCard
       className={
diff --git a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
index 1690d46ecb..8517c87cfa 100644
--- a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
+++ b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
@@ -41,6 +41,9 @@ import {notify} from 'src/shared/actions/notifications'
 import {OverlayContext} from 'src/overlays/components/OverlayController'
 import {reportErrorThroughHoneyBadger} from 'src/shared/utils/errors'
 
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
+
 // Eventing
 import {DeleteOrgOverlay, multiOrgTag} from 'src/identity/events/multiOrgEvents'
 import {event} from 'src/cloud/utils/reporting'
@@ -61,14 +64,6 @@ const linkStyle = {
   textDecoration: 'underline',
 }
 
-const SupportLink = (): JSX.Element => {
-  return (
-    <span style={linkStyle}>
-      Please use the Contact Support option in the Help menu to reach our support team.
-    </span>
-  )
-}
-
 export const SuspendPaidOrgOverlay: FC = () => {
   const account = useSelector(selectCurrentAccount)
   const org = useSelector(selectCurrentOrg)
@@ -84,6 +79,26 @@ export const SuspendPaidOrgOverlay: FC = () => {
   const orgDeleteInProgress = deleteButtonStatus === ComponentStatus.Loading
   const onClickCancel = orgDeleteInProgress ? noop : onClose
 
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
+
+  const SupportLink = (): JSX.Element => {
+    return (
+      <span style={linkStyle}>
+        Please{' '}
+        <a
+          href="#"
+          onClick={handleContactSupport}
+          style={{color: 'white', textDecoration: 'underline'}}
+        >
+          contact support
+        </a>{' '}
+        to reach our support team.
+      </span>
+    )
+  }
+
   const toggleAcceptedTerms = () => {
     const currentAcceptanceStatus = !userAcceptedTerms
     setUserAcceptedTerms(currentAcceptanceStatus)
diff --git a/src/pageLayout/containers/MainNavigation.tsx b/src/pageLayout/containers/MainNavigation.tsx
index b2dce5ffb6..197629366f 100644
--- a/src/pageLayout/containers/MainNavigation.tsx
+++ b/src/pageLayout/containers/MainNavigation.tsx
@@ -417,7 +417,7 @@ export const MainNavigation: FC = () => {
               />
             )}
           />
-          {CLOUD && (accountType === 'paid' || accountType === 'contract') && (
+          {CLOUD && (
             <TreeNav.SubItem
               id="contactSupport"
               label="Contact Support"
diff --git a/src/shared/components/NotFound.tsx b/src/shared/components/NotFound.tsx
index cc916a5279..d675441932 100644
--- a/src/shared/components/NotFound.tsx
+++ b/src/shared/components/NotFound.tsx
@@ -20,6 +20,7 @@ import {getOrg as fetchOrg} from 'src/organizations/apis'
 
 // Actions
 import {setCurrentPage} from 'src/shared/reducers/currentPage'
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 
 // Utils
 import {buildDeepLinkingMap} from 'src/utils/deepLinks'
@@ -36,99 +37,112 @@ import {CLOUD} from 'src/shared/constants'
 // API
 import {fetchDefaultAccountDefaultOrg} from 'src/identity/apis/org'
 
-const NotFoundNew: FC = () => (
-  <AppWrapper type="funnel" className="page-not-found" testID="not-found">
-    <FunnelPage enableGraphic={true} className="page-not-found-funnel">
-      {CLOUD && (
+const NotFoundNew: FC = () => {
+  const dispatch = useDispatch()
+
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
+
+  return (
+    <AppWrapper type="funnel" className="page-not-found" testID="not-found">
+      <FunnelPage enableGraphic={true} className="page-not-found-funnel">
+        {CLOUD && (
+          <FlexBox
+            direction={FlexDirection.Row}
+            margin={ComponentSize.Large}
+            stretchToFitWidth={true}
+            justifyContent={JustifyContent.SpaceBetween}
+          >
+            <LogoWithCubo />
+            <GetInfluxButton />
+          </FlexBox>
+        )}
         <FlexBox
-          direction={FlexDirection.Row}
+          className="page-not-found-content"
+          direction={FlexDirection.Column}
           margin={ComponentSize.Large}
           stretchToFitWidth={true}
-          justifyContent={JustifyContent.SpaceBetween}
         >
-          <LogoWithCubo />
-          <GetInfluxButton />
+          <h2 className="page-not-found-content-highlight">
+            404: Page Not Found
+          </h2>
+          <div>Please refresh the page or check the URL and try again.</div>
         </FlexBox>
-      )}
-      <FlexBox
-        className="page-not-found-content"
-        direction={FlexDirection.Column}
-        margin={ComponentSize.Large}
-        stretchToFitWidth={true}
-      >
-        <h2 className="page-not-found-content-highlight">
-          404: Page Not Found
-        </h2>
-        <div>Please refresh the page or check the URL and try again.</div>
-      </FlexBox>
-    </FunnelPage>
-    <FunnelPage.Footer className="page-not-found-footer">
-      <Panel
-        className="page-not-found-panel"
-        backgroundColor={InfluxColors.Grey15}
-      >
-        <FlexBox
-          direction={FlexDirection.Column}
-          className="page-not-found-panel-content"
-          margin={ComponentSize.Small}
+      </FunnelPage>
+      <FunnelPage.Footer className="page-not-found-footer">
+        <Panel
+          className="page-not-found-panel"
+          backgroundColor={InfluxColors.Grey15}
         >
-          {CLOUD && (
+          <FlexBox
+            direction={FlexDirection.Column}
+            className="page-not-found-panel-content"
+            margin={ComponentSize.Small}
+          >
+            {CLOUD && (
+              <FlexBoxChild className="page-not-found-panel-section">
+                <div className="page-not-found-panel-title">
+                  Not a URL issue?
+                </div>
+                <div>
+                  <span>
+                    The webpage you were trying to reach may have been removed
+                    or your access to this page may have expired. Please{' '}
+                    <a href="#" onClick={handleContactSupport}>
+                      contact support
+                    </a>
+                    .
+                  </span>
+                </div>
+              </FlexBoxChild>
+            )}
             <FlexBoxChild className="page-not-found-panel-section">
-              <div className="page-not-found-panel-title">Not a URL issue?</div>
+              <div className="page-not-found-panel-title">
+                Have more feedback?
+              </div>
               <div>
-                <span>
-                  The webpage you were trying to reach may have been removed or
-                  your access to this page may have expired. Please use the
-                  Contact Support option in the Help menu.
-                </span>
+                We welcome and encourage your feedback and bug reports for
+                InfluxDB. The following resources are available:
               </div>
             </FlexBoxChild>
-          )}
-          <FlexBoxChild className="page-not-found-panel-section">
-            <div className="page-not-found-panel-title">
-              Have more feedback?
-            </div>
-            <div>
-              We welcome and encourage your feedback and bug reports for
-              InfluxDB. The following resources are available:
-            </div>
-          </FlexBoxChild>
-          <FlexBox alignItems={AlignItems.Stretch} stretchToFitWidth={true}>
-            <FlexBoxChild className="page-not-found-community-links">
-              <Icon glyph={IconFont.CuboSolid}></Icon>
-              {/* Add rel options to avoid "tabnapping" */}
-              <a
-                href="https://community.influxdata.com/"
-                target="_blank"
-                rel="noreferrer noopener"
-              >
-                InfluxData Community
-              </a>
-            </FlexBoxChild>
-            <FlexBoxChild className="page-not-found-community-links">
-              <span className="slack-icon" />
-              {/* Add rel options to avoid "tabnapping" */}
-              <a
-                href="https://influxdata.com/slack/"
-                target="_blank"
-                rel="noreferrer noopener"
-              >
-                InfluxDB Community Slack
-              </a>
-            </FlexBoxChild>
+            <FlexBox alignItems={AlignItems.Stretch} stretchToFitWidth={true}>
+              <FlexBoxChild className="page-not-found-community-links">
+                <Icon glyph={IconFont.CuboSolid}></Icon>
+                {/* Add rel options to avoid "tabnapping" */}
+                <a
+                  href="https://community.influxdata.com/"
+                  target="_blank"
+                  rel="noreferrer noopener"
+                >
+                  InfluxData Community
+                </a>
+              </FlexBoxChild>
+              <FlexBoxChild className="page-not-found-community-links">
+                <span className="slack-icon" />
+                {/* Add rel options to avoid "tabnapping" */}
+                <a
+                  href="https://influxdata.com/slack/"
+                  target="_blank"
+                  rel="noreferrer noopener"
+                >
+                  InfluxDB Community Slack
+                </a>
+              </FlexBoxChild>
+            </FlexBox>
           </FlexBox>
-        </FlexBox>
-      </Panel>
-      <FunnelPage.FooterSection>
-        <FlexBox
-          alignItems={AlignItems.Center}
-          margin={ComponentSize.Large}
-          justifyContent={JustifyContent.Center}
-        ></FlexBox>
-      </FunnelPage.FooterSection>
-    </FunnelPage.Footer>
-  </AppWrapper>
-)
+        </Panel>
+        <FunnelPage.FooterSection>
+          <FlexBox
+            alignItems={AlignItems.Center}
+            margin={ComponentSize.Large}
+            justifyContent={JustifyContent.Center}
+          ></FlexBox>
+        </FunnelPage.FooterSection>
+      </FunnelPage.Footer>
+    </AppWrapper>
+  )
+}
 
 const NotFound: FC = () => {
   const [isFetchingOrg, setIsFetchingOrg] = useState(false)
diff --git a/src/support/components/ConfirmationOverlay.tsx b/src/support/components/ConfirmationOverlay.tsx
index e0b4bbe8a5..f16b9408c0 100644
--- a/src/support/components/ConfirmationOverlay.tsx
+++ b/src/support/components/ConfirmationOverlay.tsx
@@ -1,4 +1,5 @@
 import React, {FC, useContext} from 'react'
+import {useDispatch} from 'react-redux'
 
 // Components
 import {
@@ -12,11 +13,13 @@ import {
   InfluxColors,
   Overlay,
 } from '@influxdata/clockface'
-import {SafeBlankLink} from 'src/utils/SafeBlankLink'
 
 // Contexts
 import {OverlayContext} from 'src/overlays/components/OverlayController'
 
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
+
 // Constants
 import {
   INFLUXDATA_SUPPORT_CONTACT_UK,
@@ -31,6 +34,11 @@ interface OwnProps {
 
 const ConfirmationOverlay: FC<OwnProps> = () => {
   const {onClose} = useContext(OverlayContext)
+  const dispatch = useDispatch()
+
+  const handleContactSupport = () => {
+    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  }
 
   return (
     <Overlay.Container maxWidth={550}>
@@ -65,8 +73,11 @@ const ConfirmationOverlay: FC<OwnProps> = () => {
           account email for a confirmation and follow-up.
         </p>
         <p>
-          For more resources, you can contact our support team via the Contact
-          Support option in the Help menu.
+          For more resources, you can{' '}
+          <a href="#" onClick={handleContactSupport}>
+            contact our support team
+          </a>
+          .
         </p>
       </Overlay.Body>
       <Overlay.Footer>
diff --git a/src/support/components/ContactSupportOverlay.tsx b/src/support/components/ContactSupportOverlay.tsx
index eb9d508009..a5ed2c904c 100644
--- a/src/support/components/ContactSupportOverlay.tsx
+++ b/src/support/components/ContactSupportOverlay.tsx
@@ -26,7 +26,10 @@ import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 import {OverlayContext} from 'src/overlays/components/OverlayController'
 
 // Selectors
-import {selectQuartzIdentity} from 'src/identity/selectors'
+import {
+  selectCurrentAccountType,
+  selectQuartzIdentity,
+} from 'src/identity/selectors'
 
 // Utils
 import {event} from 'src/cloud/utils/reporting'
@@ -64,6 +67,7 @@ interface OwnProps {
 export const ContactSupportOverlay: FC<OwnProps> = () => {
   const quartzIdentity = useSelector(selectQuartzIdentity)
   const {user: identityUser, org: identityOrg} = quartzIdentity.currentIdentity
+  const accountType = useSelector(selectCurrentAccountType)
 
   const [subject, setSubject] = useState('')
   const [severity, setSeverity] = useState('3 - Standard')
@@ -72,6 +76,8 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
 
   const dispatch = useDispatch()
 
+  const isContractOrPaid = accountType === 'contract' || accountType === 'paid'
+
   const severityLevel = [
     '1 - Critical',
     '2 - High',
@@ -124,6 +130,10 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
     }
   }
 
+  // const accountType = useSelector(selectCurrentAccountType)
+  const isContractOrPAYG = true
+  // accountType === 'contract' || accountType === 'pay_as_you_go'
+
   const handleSubjectChange = (event: ChangeEvent<HTMLInputElement>) => {
     setSubject(event.target.value)
   }
@@ -172,55 +182,65 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
       />
       <Form>
         <Overlay.Body>
-          <p className="status-page-text">
-            <span>
-              {' '}
-              <Icon glyph={IconFont.Info_New} />{' '}
-            </span>
-            Check our{' '}
-            <SafeBlankLink href="https://status.influxdata.com">
-              status page
-            </SafeBlankLink>{' '}
-            to see if there is an outage impacting your region.
-          </p>
-          <Form.Element label="Subject" required={true}>
-            <Input
-              name="subject"
-              value={subject}
-              onChange={handleSubjectChange}
-              testID="contact-support-subject-input"
-            />
-          </Form.Element>
-          <Form.Element
-            label="Severity"
-            required={true}
-            labelAddOn={severityTip}
-          >
-            <SelectDropdown
-              options={severityLevel}
-              selectedOption={severity}
-              onSelect={handleChangeSeverity}
-              indicator={DropdownItemType.None}
-              testID="severity-level-dropdown"
-            />
-          </Form.Element>
-          <Form.ValidationElement
-            label="Description"
-            required={true}
-            value={description}
-            validationFunc={handleValidation}
-          >
-            {status => (
-              <TextArea
-                status={status}
-                rows={10}
-                testID="contact-support-description--textarea"
-                name="description"
+          {isContractOrPaid ? (
+            <>
+              <p className="status-page-text">
+                <span>
+                  {' '}
+                  <Icon glyph={IconFont.Info_New} />{' '}
+                </span>
+                Check our{' '}
+                <SafeBlankLink href="https://status.influxdata.com">
+                  status page
+                </SafeBlankLink>{' '}
+                to see if there is an outage impacting your region.
+              </p>
+              <Form.Element label="Subject" required={true}>
+                <Input
+                  name="subject"
+                  value={subject}
+                  onChange={handleSubjectChange}
+                  testID="contact-support-subject-input"
+                />
+              </Form.Element>
+              <Form.Element
+                label="Severity"
+                required={true}
+                labelAddOn={severityTip}
+              >
+                <SelectDropdown
+                  options={severityLevel}
+                  selectedOption={severity}
+                  onSelect={handleChangeSeverity}
+                  indicator={DropdownItemType.None}
+                  testID="severity-level-dropdown"
+                />
+              </Form.Element>
+              <Form.ValidationElement
+                label="Description"
+                required={true}
                 value={description}
-                onChange={handleDescriptionChange}
-              />
-            )}
-          </Form.ValidationElement>
+                validationFunc={handleValidation}
+              >
+                {status => (
+                  <TextArea
+                    status={status}
+                    rows={10}
+                    testID="contact-support-description--textarea"
+                    name="description"
+                    value={description}
+                    onChange={handleDescriptionChange}
+                  />
+                )}
+              </Form.ValidationElement>
+            </>
+          ) : (
+            <p>
+              Support is available only for paying customers. Please upgrade
+              your account or log into your paid account to submit a support
+              case.
+            </p>
+          )}
         </Overlay.Body>
       </Form>
       <Overlay.Footer>
@@ -231,14 +251,16 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
           type={ButtonType.Button}
           testID="contact-support--cancel"
         />
-        <Button
-          text="Submit"
-          color={ComponentColor.Success}
-          type={ButtonType.Submit}
-          testID="contact-support--submit"
-          status={submitButtonStatus}
-          onClick={handleSubmit}
-        />
+        {isContractOrPaid && (
+          <Button
+            text="Submit"
+            color={ComponentColor.Success}
+            type={ButtonType.Submit}
+            testID="contact-support--submit"
+            status={submitButtonStatus}
+            onClick={handleSubmit}
+          />
+        )}
       </Overlay.Footer>
     </Overlay.Container>
   )

From 3c9857beaba9789e8b0119dd85131b514b1b5b3c Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Wed, 3 Dec 2025 15:02:49 -0500
Subject: [PATCH 5/6] chore: fix lint errors

---
 .../SeriesCardinalityIncreaseForm.tsx         | 85 ++++++++++++++++---
 src/cloud/components/WriteLimitOverlay.tsx    | 69 ++++++++++++---
 src/pageLayout/containers/MainNavigation.tsx  |  2 -
 .../components/ContactSupportOverlay.tsx      | 23 +++--
 4 files changed, 138 insertions(+), 41 deletions(-)

diff --git a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
index 8e1d50b610..31b70f6b7b 100644
--- a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
+++ b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
@@ -1,38 +1,97 @@
 // Libraries
-import React, {FC} from 'react'
-import {useDispatch} from 'react-redux'
+import React, {FC, useState} from 'react'
+import {useDispatch, useSelector} from 'react-redux'
 
 // Components
 import {
   Form,
   Heading,
+  TextArea,
+  Button,
+  ButtonType,
+  ButtonShape,
   InfluxColors,
+  ComponentSize,
+  ComponentColor,
   HeadingElement,
+  ComponentStatus,
 } from '@influxdata/clockface'
 
 // Actions
 import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 
+// Selectors
+import {selectQuartzIdentity} from 'src/identity/selectors'
+
 export const SeriesCardinalityIncreaseForm: FC = () => {
   const dispatch = useDispatch()
+  const quartzIdentity = useSelector(selectQuartzIdentity)
+  const {org: identityOrg} = quartzIdentity.currentIdentity
+
+  const [requestDetails, setRequestDetails] = useState('')
+
+  const handleDetailsValidation = (value: string): string | null => {
+    if (!value) {
+      return 'Request details are required'
+    }
+    return null
+  }
+
+  const isFormValid = (): boolean => {
+    return !!requestDetails
+  }
+
+  const handleSubmit = (): void => {
+    const orgName = identityOrg.name
+    const orgID = identityOrg.id
 
-  const handleContactSupport = () => {
-    dispatch(showOverlay('contact-support', null, dismissOverlay))
+    dispatch(
+      showOverlay(
+        'contact-support',
+        {
+          subject: `[Org: ${orgName}] [Org Id: ${orgID}] Request Series Cardinality Limit Increase`,
+          description: requestDetails,
+        },
+        dismissOverlay
+      )
+    )
   }
 
   return (
-    <div>
+    <Form onSubmit={handleSubmit}>
       <Form.Divider lineColor={InfluxColors.Grey15} />
       <Heading element={HeadingElement.H4}>
         Request Series Cardinality Limit Increase
       </Heading>
-      <p>
-        To request a cardinality limit increase, please{' '}
-        <a href="#" onClick={handleContactSupport}>
-          contact support
-        </a>
-        .
-      </p>
-    </div>
+      <Form.ValidationElement
+        label="Request Details"
+        validationFunc={handleDetailsValidation}
+        value={requestDetails}
+        required={true}
+      >
+        {status => (
+          <TextArea
+            name="Request Details"
+            placeholder="Tell us how much series cardinality you need, your use-case details, what you've tried so far, and why you need an increase."
+            status={status}
+            value={requestDetails}
+            onChange={e => setRequestDetails(e.target.value)}
+            testID="cardinality-request-details"
+            rows={10}
+          />
+        )}
+      </Form.ValidationElement>
+      <Button
+        shape={ButtonShape.Default}
+        type={ButtonType.Submit}
+        size={ComponentSize.Medium}
+        color={ComponentColor.Primary}
+        className="rate-alert--request-increase-button"
+        text="Submit Request"
+        status={
+          isFormValid() ? ComponentStatus.Default : ComponentStatus.Disabled
+        }
+      />
+    </Form>
   )
 }
diff --git a/src/cloud/components/WriteLimitOverlay.tsx b/src/cloud/components/WriteLimitOverlay.tsx
index d25a26f396..bd967c5330 100644
--- a/src/cloud/components/WriteLimitOverlay.tsx
+++ b/src/cloud/components/WriteLimitOverlay.tsx
@@ -1,30 +1,53 @@
-import React, {useContext, FC} from 'react'
-import {useDispatch} from 'react-redux'
+import React, {useState, useContext, FC} from 'react'
+import {useDispatch, useSelector} from 'react-redux'
 
 import {
   OverlayContainer,
   Overlay,
+  Form,
   Heading,
+  Input,
   HeadingElement,
   Button,
   ButtonType,
   ButtonShape,
   ComponentSize,
   ComponentColor,
+  ComponentStatus,
+  InputType,
 } from '@influxdata/clockface'
 
 import {OverlayContext} from 'src/overlays/components/OverlayController'
 import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
 
+// Selectors
+import {selectQuartzIdentity} from 'src/identity/selectors'
+
 // Design
 import './WriteLimitOverlay.scss'
 
 const WriteLimitOverlay: FC = () => {
+  const [limitReason, setLimitReason] = useState('')
+
   const {onClose} = useContext(OverlayContext)
   const dispatch = useDispatch()
+  const quartzIdentity = useSelector(selectQuartzIdentity)
+  const {org: identityOrg} = quartzIdentity.currentIdentity
 
-  const handleContactSupport = () => {
-    dispatch(showOverlay('contact-support', null, dismissOverlay))
+  const handleSubmit = (): void => {
+    const orgName = identityOrg.name
+    const orgID = identityOrg.id
+
+    dispatch(
+      showOverlay(
+        'contact-support',
+        {
+          subject: `[Org: ${orgName}] [Org Id: ${orgID}] Request Query Write Limit Increase`,
+          description: limitReason,
+        },
+        dismissOverlay
+      )
+    )
   }
 
   return (
@@ -39,18 +62,23 @@ const WriteLimitOverlay: FC = () => {
         wrapText={true}
       />
       <Overlay.Body className="limits-increasewrites--body">
-        <div className="limits-increasewrites--form">
+        <Form onSubmit={handleSubmit} className="limits-increasewrites--form">
           <Heading element={HeadingElement.H4}>
             Request Query Write Limit Increase
           </Heading>
-          <p>
-            To request a write limit increase, please{' '}
-            <a href="#" onClick={handleContactSupport}>
-              contact support
-            </a>
-            .
-          </p>
-        </div>
+          <Form.Element label="Request Details" required={true}>
+            <Input
+              name="Write Limit Increase"
+              placeholder="Tell us how much you need your write limit raised and your use-case details"
+              required={true}
+              autoFocus={true}
+              value={limitReason}
+              onChange={e => setLimitReason(e.target.value)}
+              testID="rate-alert-form-amount"
+              type={InputType.Text}
+            />
+          </Form.Element>
+        </Form>
       </Overlay.Body>
       <Overlay.Footer>
         <Button
@@ -58,9 +86,22 @@ const WriteLimitOverlay: FC = () => {
           type={ButtonType.Submit}
           size={ComponentSize.Medium}
           color={ComponentColor.Tertiary}
-          text="Close"
+          text="Cancel"
           onClick={onClose}
         />
+        <Button
+          shape={ButtonShape.Default}
+          onClick={handleSubmit}
+          size={ComponentSize.Medium}
+          color={ComponentColor.Primary}
+          className="rate-alert--request-increase-button"
+          text="Submit Request"
+          status={
+            limitReason.length
+              ? ComponentStatus.Default
+              : ComponentStatus.Disabled
+          }
+        />
       </Overlay.Footer>
     </OverlayContainer>
   )
diff --git a/src/pageLayout/containers/MainNavigation.tsx b/src/pageLayout/containers/MainNavigation.tsx
index 197629366f..2cec80f574 100644
--- a/src/pageLayout/containers/MainNavigation.tsx
+++ b/src/pageLayout/containers/MainNavigation.tsx
@@ -271,8 +271,6 @@ export const MainNavigation: FC = () => {
     return null
   }
 
-  const isContractCustomer = accountType === 'contract'
-
   const docslink = isIOxOrg
     ? 'https://docs.influxdata.com/influxdb/cloud-serverless/'
     : 'https://docs.influxdata.com/'
diff --git a/src/support/components/ContactSupportOverlay.tsx b/src/support/components/ContactSupportOverlay.tsx
index a5ed2c904c..44df3d3c4e 100644
--- a/src/support/components/ContactSupportOverlay.tsx
+++ b/src/support/components/ContactSupportOverlay.tsx
@@ -68,15 +68,19 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
   const quartzIdentity = useSelector(selectQuartzIdentity)
   const {user: identityUser, org: identityOrg} = quartzIdentity.currentIdentity
   const accountType = useSelector(selectCurrentAccountType)
+  const {onClose, params} = useContext(OverlayContext)
 
-  const [subject, setSubject] = useState('')
+  const prefilledSubject = params?.subject || ''
+  const prefilledDescription = params?.description || ''
+
+  const [subject, setSubject] = useState(prefilledSubject)
   const [severity, setSeverity] = useState('3 - Standard')
-  const [description, setDescription] = useState('')
-  const {onClose} = useContext(OverlayContext)
+  const [description, setDescription] = useState(prefilledDescription)
 
   const dispatch = useDispatch()
 
-  const isContractOrPaid = accountType === 'contract' || accountType === 'paid'
+  const isContractOrPAYG =
+    accountType === 'contract' || accountType === 'pay_as_you_go'
 
   const severityLevel = [
     '1 - Critical',
@@ -105,11 +109,10 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
     const orgName = identityOrg.name
     const orgID = identityOrg.id
 
-    const descriptionWithOrgId = `${description} \n\n [Org Name: ${orgName}] [Org Id: ${orgID}]`
     const translatedSeverity = translateSeverityLevelForSfdc(severity)
     try {
       await createSfdcSupportCase(
-        descriptionWithOrgId,
+        description,
         userEmail,
         translatedSeverity,
         subject
@@ -130,10 +133,6 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
     }
   }
 
-  // const accountType = useSelector(selectCurrentAccountType)
-  const isContractOrPAYG = true
-  // accountType === 'contract' || accountType === 'pay_as_you_go'
-
   const handleSubjectChange = (event: ChangeEvent<HTMLInputElement>) => {
     setSubject(event.target.value)
   }
@@ -182,7 +181,7 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
       />
       <Form>
         <Overlay.Body>
-          {isContractOrPaid ? (
+          {isContractOrPAYG ? (
             <>
               <p className="status-page-text">
                 <span>
@@ -251,7 +250,7 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
           type={ButtonType.Button}
           testID="contact-support--cancel"
         />
-        {isContractOrPaid && (
+        {isContractOrPAYG && (
           <Button
             text="Submit"
             color={ComponentColor.Success}

From 258b7abffe436ee0f242e78f82ff41289b21c048 Mon Sep 17 00:00:00 2001
From: Mohammad Naqvi <162358280+mnaqvi08@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:05:34 -0500
Subject: [PATCH 6/6] chore: address feedback

---
 .../SeriesCardinalityIncreaseForm.tsx         |   2 +-
 src/shared/apis/sfdc.ts                       |  13 +-
 .../components/ContactSupportOverlay.tsx      | 114 ++++--------------
 src/support/components/FreeSupportMessage.tsx |  10 ++
 src/support/components/PaidSupportForm.tsx    | 111 +++++++++++++++++
 5 files changed, 155 insertions(+), 95 deletions(-)
 create mode 100644 src/support/components/FreeSupportMessage.tsx
 create mode 100644 src/support/components/PaidSupportForm.tsx

diff --git a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
index 31b70f6b7b..d4d0919ead 100644
--- a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
+++ b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx
@@ -38,7 +38,7 @@ export const SeriesCardinalityIncreaseForm: FC = () => {
   }
 
   const isFormValid = (): boolean => {
-    return !!requestDetails
+    return Boolean(requestDetails)
   }
 
   const handleSubmit = (): void => {
diff --git a/src/shared/apis/sfdc.ts b/src/shared/apis/sfdc.ts
index 952020db17..4b6c7153bb 100644
--- a/src/shared/apis/sfdc.ts
+++ b/src/shared/apis/sfdc.ts
@@ -13,10 +13,19 @@ export const createSfdcSupportCase = async (
   description: string,
   email: string,
   severity: string,
-  subject: string
+  subject: string,
+  caseOrigin: string,
+  deploymentType: string
 ) => {
   const params: typeof PostUiproxySfdcSupportParams = {
-    data: {description, email, severity, subject},
+    data: {
+      description,
+      email,
+      severity,
+      subject,
+      caseOrigin,
+      deploymentType,
+    },
   }
 
   const response = await postUiproxySfdcSupport(params)
diff --git a/src/support/components/ContactSupportOverlay.tsx b/src/support/components/ContactSupportOverlay.tsx
index 44df3d3c4e..a2650a05bf 100644
--- a/src/support/components/ContactSupportOverlay.tsx
+++ b/src/support/components/ContactSupportOverlay.tsx
@@ -7,17 +7,11 @@ import {
   ButtonType,
   ComponentColor,
   ComponentStatus,
-  DropdownItemType,
   Form,
-  Icon,
-  IconFont,
-  Input,
   Overlay,
-  QuestionMarkTooltip,
-  SelectDropdown,
-  TextArea,
 } from '@influxdata/clockface'
-import {SafeBlankLink} from 'src/utils/SafeBlankLink'
+import {PaidSupportForm} from './PaidSupportForm'
+import {FreeSupportMessage} from './FreeSupportMessage'
 
 // Actions
 import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
@@ -30,6 +24,7 @@ import {
   selectCurrentAccountType,
   selectQuartzIdentity,
 } from 'src/identity/selectors'
+import {isOrgIOx} from 'src/organizations/selectors'
 
 // Utils
 import {event} from 'src/cloud/utils/reporting'
@@ -68,6 +63,7 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
   const quartzIdentity = useSelector(selectQuartzIdentity)
   const {user: identityUser, org: identityOrg} = quartzIdentity.currentIdentity
   const accountType = useSelector(selectCurrentAccountType)
+  const isIOxOrg = useSelector(isOrgIOx)
   const {onClose, params} = useContext(OverlayContext)
 
   const prefilledSubject = params?.subject || ''
@@ -82,13 +78,6 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
   const isContractOrPAYG =
     accountType === 'contract' || accountType === 'pay_as_you_go'
 
-  const severityLevel = [
-    '1 - Critical',
-    '2 - High',
-    '3 - Standard',
-    '4 - Request',
-  ]
-
   const submitButtonStatus =
     description.length && severity.length && subject.length
       ? ComponentStatus.Default
@@ -110,12 +99,19 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
     const orgID = identityOrg.id
 
     const translatedSeverity = translateSeverityLevelForSfdc(severity)
+    const caseOrigin = 'Cloud App'
+    const deploymentType = isIOxOrg
+      ? 'InfluxDB Cloud Serverless'
+      : 'InfluxCloud2.0'
+
     try {
       await createSfdcSupportCase(
         description,
         userEmail,
         translatedSeverity,
-        subject
+        subject,
+        caseOrigin,
+        deploymentType
       )
       event(
         'helpBar.contactSupportRequest.submitted',
@@ -152,26 +148,6 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
     return null
   }
 
-  const severityTip = (): JSX.Element => {
-    const tooltipContent = (
-      <div>
-        Please refer to our severity levels in our
-        <SafeBlankLink href="https://www.influxdata.com/legal/support-policy">
-          {' '}
-          support policy{' '}
-        </SafeBlankLink>
-        website
-      </div>
-    )
-    return (
-      <QuestionMarkTooltip
-        diameter={14}
-        tooltipContents={tooltipContent}
-        tooltipStyle={{fontSize: '13px'}}
-      />
-    )
-  }
-
   return (
     <Overlay.Container maxWidth={550}>
       <Overlay.Header
@@ -182,63 +158,17 @@ export const ContactSupportOverlay: FC<OwnProps> = () => {
       <Form>
         <Overlay.Body>
           {isContractOrPAYG ? (
-            <>
-              <p className="status-page-text">
-                <span>
-                  {' '}
-                  <Icon glyph={IconFont.Info_New} />{' '}
-                </span>
-                Check our{' '}
-                <SafeBlankLink href="https://status.influxdata.com">
-                  status page
-                </SafeBlankLink>{' '}
-                to see if there is an outage impacting your region.
-              </p>
-              <Form.Element label="Subject" required={true}>
-                <Input
-                  name="subject"
-                  value={subject}
-                  onChange={handleSubjectChange}
-                  testID="contact-support-subject-input"
-                />
-              </Form.Element>
-              <Form.Element
-                label="Severity"
-                required={true}
-                labelAddOn={severityTip}
-              >
-                <SelectDropdown
-                  options={severityLevel}
-                  selectedOption={severity}
-                  onSelect={handleChangeSeverity}
-                  indicator={DropdownItemType.None}
-                  testID="severity-level-dropdown"
-                />
-              </Form.Element>
-              <Form.ValidationElement
-                label="Description"
-                required={true}
-                value={description}
-                validationFunc={handleValidation}
-              >
-                {status => (
-                  <TextArea
-                    status={status}
-                    rows={10}
-                    testID="contact-support-description--textarea"
-                    name="description"
-                    value={description}
-                    onChange={handleDescriptionChange}
-                  />
-                )}
-              </Form.ValidationElement>
-            </>
+            <PaidSupportForm
+              subject={subject}
+              severity={severity}
+              description={description}
+              onSubjectChange={handleSubjectChange}
+              onSeverityChange={handleChangeSeverity}
+              onDescriptionChange={handleDescriptionChange}
+              onValidation={handleValidation}
+            />
           ) : (
-            <p>
-              Support is available only for paying customers. Please upgrade
-              your account or log into your paid account to submit a support
-              case.
-            </p>
+            <FreeSupportMessage />
           )}
         </Overlay.Body>
       </Form>
diff --git a/src/support/components/FreeSupportMessage.tsx b/src/support/components/FreeSupportMessage.tsx
new file mode 100644
index 0000000000..176a78a462
--- /dev/null
+++ b/src/support/components/FreeSupportMessage.tsx
@@ -0,0 +1,10 @@
+import React, {FC} from 'react'
+
+export const FreeSupportMessage: FC = () => {
+  return (
+    <p>
+      Support is available only for paying customers. Please upgrade your
+      account or log into your paid account to submit a support case.
+    </p>
+  )
+}
diff --git a/src/support/components/PaidSupportForm.tsx b/src/support/components/PaidSupportForm.tsx
new file mode 100644
index 0000000000..cf4f87d0f6
--- /dev/null
+++ b/src/support/components/PaidSupportForm.tsx
@@ -0,0 +1,111 @@
+import React, {FC, ChangeEvent} from 'react'
+
+// Components
+import {
+  DropdownItemType,
+  Form,
+  Icon,
+  IconFont,
+  Input,
+  QuestionMarkTooltip,
+  SelectDropdown,
+  TextArea,
+} from '@influxdata/clockface'
+import {SafeBlankLink} from 'src/utils/SafeBlankLink'
+
+interface Props {
+  subject: string
+  severity: string
+  description: string
+  onSubjectChange: (event: ChangeEvent<HTMLInputElement>) => void
+  onSeverityChange: (severity: string) => void
+  onDescriptionChange: (event: ChangeEvent<HTMLTextAreaElement>) => void
+  onValidation: (value: string) => string | null
+}
+
+const severityLevel = [
+  '1 - Critical',
+  '2 - High',
+  '3 - Standard',
+  '4 - Request',
+]
+
+const severityTip = (): JSX.Element => {
+  const tooltipContent = (
+    <div>
+      Please refer to our severity levels in our
+      <SafeBlankLink href="https://www.influxdata.com/legal/support-policy">
+        {' '}
+        support policy{' '}
+      </SafeBlankLink>
+      website
+    </div>
+  )
+  return (
+    <QuestionMarkTooltip
+      diameter={14}
+      tooltipContents={tooltipContent}
+      tooltipStyle={{fontSize: '13px'}}
+    />
+  )
+}
+
+export const PaidSupportForm: FC<Props> = ({
+  subject,
+  severity,
+  description,
+  onSubjectChange,
+  onSeverityChange,
+  onDescriptionChange,
+  onValidation,
+}) => {
+  return (
+    <>
+      <p className="status-page-text">
+        <span>
+          {' '}
+          <Icon glyph={IconFont.Info_New} />{' '}
+        </span>
+        Check our{' '}
+        <SafeBlankLink href="https://status.influxdata.com">
+          status page
+        </SafeBlankLink>{' '}
+        to see if there is an outage impacting your region.
+      </p>
+      <Form.Element label="Subject" required={true}>
+        <Input
+          name="subject"
+          value={subject}
+          onChange={onSubjectChange}
+          testID="contact-support-subject-input"
+        />
+      </Form.Element>
+      <Form.Element label="Severity" required={true} labelAddOn={severityTip}>
+        <SelectDropdown
+          options={severityLevel}
+          selectedOption={severity}
+          onSelect={onSeverityChange}
+          indicator={DropdownItemType.None}
+          testID="severity-level-dropdown"
+        />
+      </Form.Element>
+      <Form.ValidationElement
+        label="Description"
+        required={true}
+        value={description}
+        validationFunc={onValidation}
+      >
+        {status => (
+          <TextArea
+            status={status}
+            rows={10}
+            testID="contact-support-description--textarea"
+            name="description"
+            value={description}
+            onChange={onDescriptionChange}
+          />
+        )}
+      </Form.ValidationElement>
+    </>
+  )
+}