diff --git a/static/gsApp/views/partnershipAgreement/index.tsx b/static/gsApp/views/partnershipAgreement/index.tsx
index b619c049a6d9..b8ed1365ca4e 100644
--- a/static/gsApp/views/partnershipAgreement/index.tsx
+++ b/static/gsApp/views/partnershipAgreement/index.tsx
@@ -1,9 +1,17 @@
+import {useMutation} from '@tanstack/react-query';
+
+import {defaultFormOptions, useScrapsForm} from '@sentry/scraps/form';
+import {Flex, Stack} from '@sentry/scraps/layout';
 import {ExternalLink} from '@sentry/scraps/link';
+import {Heading, Text} from '@sentry/scraps/text';
 
-import {Form} from 'sentry/components/forms/form';
+import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {NarrowLayout} from 'sentry/components/narrowLayout';
+import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
 import {t, tct} from 'sentry/locale';
 import type {PartnershipAgreementProps} from 'sentry/types/overrides';
+import {fetchMutation} from 'sentry/utils/queryClient';
+import {getRequestErrorUserMessage} from 'sentry/utils/requestError/getRequestErrorUserMessage';
 
 export default function PartnershipAgreement({
   partnerDisplayName,
@@ -11,6 +19,35 @@ export default function PartnershipAgreement({
   onSubmitSuccess,
   organizationSlug,
 }: PartnershipAgreementProps) {
+  const mutation = useMutation({
+    mutationFn: (data: Record<string, never>) =>
+      fetchMutation({
+        url: `/organizations/${organizationSlug}/partnership-agreements/`,
+        method: 'POST',
+        data,
+      }),
+    onSuccess: onSubmitSuccess,
+    onError: error => {
+      addErrorMessage(
+        getRequestErrorUserMessage(
+          error,
+          t('Unable to accept the partnership agreement.')
+        )
+      );
+    },
+  });
+  const form = useScrapsForm({
+    ...defaultFormOptions,
+    defaultValues: {},
+    onSubmit: async ({value}) => {
+      try {
+        await mutation.mutateAsync(value);
+      } catch {
+        // Prevent an unhandled rejection; the mutation displays the request error.
+      }
+    },
+  });
+
   const tos = (
     <ExternalLink href="https://sentry.io/terms/">terms of service</ExternalLink>
   );
@@ -20,22 +57,30 @@ export default function PartnershipAgreement({
 
   return (
     <NarrowLayout>
-      <Form
-        apiMethod="POST"
-        apiEndpoint={`/organizations/${organizationSlug}/partnership-agreements/`}
-        submitLabel={t('Continue')}
-        onSubmitSuccess={onSubmitSuccess}
-      >
-        {agreements.includes('partner_presence')
-          ? tct(
-              "This organization is created in partnership with [partnerDisplayName]. By pressing continue, you acknowledge that you have agreed to Sentry's [tos] and [privacyPolicy] through [partnerDisplayName] and are aware of the partner's presence in the organization as a manager.",
-              {partnerDisplayName, tos, privacyPolicy}
-            )
-          : tct(
-              "This organization is created in partnership with [partnerDisplayName]. By pressing continue, you acknowledge that you have agreed to Sentry's [tos] and [privacyPolicy] through [partnerDisplayName].",
-              {partnerDisplayName, tos, privacyPolicy}
-            )}
-      </Form>
+      <SentryDocumentTitle title={t('Partnership Agreement')} />
+      <Stack gap="xl">
+        <Stack gap="md">
+          <Heading as="h3" size="xl">
+            {t('Partnership Agreement')}
+          </Heading>
+          <Text as="p">
+            {agreements.includes('partner_presence')
+              ? tct(
+                  "This organization is created in partnership with [partnerDisplayName]. By pressing continue, you acknowledge that you have agreed to Sentry's [tos] and [privacyPolicy] through [partnerDisplayName] and are aware of the partner's presence in the organization as a manager.",
+                  {partnerDisplayName, tos, privacyPolicy}
+                )
+              : tct(
+                  "This organization is created in partnership with [partnerDisplayName]. By pressing continue, you acknowledge that you have agreed to Sentry's [tos] and [privacyPolicy] through [partnerDisplayName].",
+                  {partnerDisplayName, tos, privacyPolicy}
+                )}
+          </Text>
+        </Stack>
+        <form.AppForm form={form}>
+          <Flex justify="end" borderTop="secondary" paddingTop="xl" paddingBottom="xl">
+            <form.SubmitButton>{t('Continue')}</form.SubmitButton>
+          </Flex>
+        </form.AppForm>
+      </Stack>
     </NarrowLayout>
   );
 }