diff --git a/shared-helpers/index.ts b/shared-helpers/index.ts
index 4680ea1ce7..c5896893da 100644
--- a/shared-helpers/index.ts
+++ b/shared-helpers/index.ts
@@ -29,6 +29,7 @@ export * from "./src/utilities/token"
 export * from "./src/utilities/unitTypes"
 export * from "./src/views/components/BloomCard"
 export * from "./src/views/components/ClickableCard"
+export * from "./src/views/components/Form"
 export * from "./src/views/CustomIconMap"
 export * from "./src/views/forgot-password/FormForgotPassword"
 export * from "./src/views/layout/ExygyFooter"
diff --git a/shared-helpers/src/views/CustomIconMap.tsx b/shared-helpers/src/views/CustomIconMap.tsx
index 838f326614..163bfcc2d3 100644
--- a/shared-helpers/src/views/CustomIconMap.tsx
+++ b/shared-helpers/src/views/CustomIconMap.tsx
@@ -3,6 +3,7 @@ import { Application, Door, Profile } from "./CustomIcons"
 import LockClosedIcon from "@heroicons/react/24/solid/LockClosedIcon"
 import ChevronLeftIcon from "@heroicons/react/20/solid/ChevronLeftIcon"
 import Clock from "@heroicons/react/24/outline/ClockIcon"
+import Cog8ToothIcon from "@heroicons/react/24/solid/Cog8ToothIcon"
 import HeartIcon from "@heroicons/react/24/outline/HeartIcon"
 import HeartIconSolid from "@heroicons/react/24/solid/HeartIcon"
 import HomeModernIcon from "@heroicons/react/24/outline/HomeModernIcon"
@@ -19,6 +20,7 @@ export const CustomIconMap = {
   lockClosed: <LockClosedIcon />,
   chevronLeft: <ChevronLeftIcon />,
   clock: <Clock />,
+  cog: <Cog8ToothIcon />,
   heartIcon: <HeartIcon />,
   heartIconSolid: <HeartIconSolid />,
   home: <HomeModernIcon />,
diff --git a/shared-helpers/src/views/components/BloomCard.module.scss b/shared-helpers/src/views/components/BloomCard.module.scss
index a6d421cf0c..8565c7b900 100644
--- a/shared-helpers/src/views/components/BloomCard.module.scss
+++ b/shared-helpers/src/views/components/BloomCard.module.scss
@@ -1,4 +1,5 @@
 .form-card {
+  --card-footer-background-color: var(--seeds-bg-color-surface-primary);
   --card-content-padding-inline: var(--seeds-s12);
   --card-header-padding-inline: var(--seeds-s12);
   @media (max-width: theme("screens.sm")) {
diff --git a/shared-helpers/src/views/components/Form.tsx b/shared-helpers/src/views/components/Form.tsx
new file mode 100644
index 0000000000..a2f1885f3e
--- /dev/null
+++ b/shared-helpers/src/views/components/Form.tsx
@@ -0,0 +1,21 @@
+import React from "react"
+
+interface FormProps {
+  children: React.ReactNode
+  id?: string
+  className?: string
+  disableSubmitOnEnter?: boolean
+  onSubmit?: () => unknown
+}
+
+export const Form = ({ id, children, className, disableSubmitOnEnter, onSubmit }: FormProps) => {
+  function onKeyDown(e: React.KeyboardEvent<HTMLElement>) {
+    if (disableSubmitOnEnter && e.key === "Enter" && !(e.target instanceof HTMLButtonElement)) e.preventDefault()
+  }
+
+  return (
+    <form id={id} className={className} onSubmit={onSubmit} onKeyDown={onKeyDown} noValidate>
+      {children}
+    </form>
+  )
+}
diff --git a/shared-helpers/src/views/forgot-password/FormForgotPassword.tsx b/shared-helpers/src/views/forgot-password/FormForgotPassword.tsx
index ca7bbc41ac..c8bd2e6a3d 100644
--- a/shared-helpers/src/views/forgot-password/FormForgotPassword.tsx
+++ b/shared-helpers/src/views/forgot-password/FormForgotPassword.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { Button } from "@bloom-housing/ui-seeds"
-import { Field, Form, t, AlertBox, AlertNotice, ErrorMessage } from "@bloom-housing/ui-components"
+import { Field, t, AlertBox, AlertNotice, ErrorMessage } from "@bloom-housing/ui-components"
 import { CardSection } from "@bloom-housing/ui-seeds/src/blocks/Card"
 import { NetworkErrorReset, NetworkStatusContent } from "../../auth/catchNetworkError"
 import type { UseFormMethods } from "react-hook-form"
@@ -8,6 +8,7 @@ import { BloomCard } from "../components/BloomCard"
 import { emailRegex } from "../../utilities/regex"
 import styles from "./FormForgotPassword.module.scss"
 import { useRouter } from "next/router"
+import { Form } from "../components/Form"
 
 export type FormForgotPasswordProps = {
   control: FormForgotPasswordControl
diff --git a/shared-helpers/src/views/sign-in/FormSignIn.module.scss b/shared-helpers/src/views/sign-in/FormSignIn.module.scss
index 76bab83361..6b23d9175f 100644
--- a/shared-helpers/src/views/sign-in/FormSignIn.module.scss
+++ b/shared-helpers/src/views/sign-in/FormSignIn.module.scss
@@ -1,8 +1,17 @@
 .forgot-password {
-  float: inline-end;
   font-size: var(--seeds-font-size-sm);
-  text-decoration-line: underline;
-  color: var(--seeds-color-blue-900);
+}
+
+.forgot-password-wrapper {
+  grid-area: field;
+  width: fit-content;
+  justify-self: end;
+  text-align: right;
+}
+
+.password-grid {
+  display: grid;
+  grid-template-areas: "field";
 }
 
 .sign-in-error-container {
@@ -24,6 +33,7 @@
 
 .sign-in-password-input {
   margin-bottom: var(--seeds-s3);
+  grid-area: field;
 }
 
 .sign-in-action {
diff --git a/shared-helpers/src/views/sign-in/FormSignIn.tsx b/shared-helpers/src/views/sign-in/FormSignIn.tsx
index 6204feb755..b0a94e5f0b 100644
--- a/shared-helpers/src/views/sign-in/FormSignIn.tsx
+++ b/shared-helpers/src/views/sign-in/FormSignIn.tsx
@@ -19,6 +19,9 @@ export type FormSignInProps = {
 
 export type FormSignInControl = {
   errors: UseFormMethods["errors"]
+  handleSubmit?: UseFormMethods["handleSubmit"]
+  register?: UseFormMethods["register"]
+  watch?: UseFormMethods["watch"]
 }
 
 export type FormSignInValues = {
diff --git a/shared-helpers/src/views/sign-in/FormSignInDefault.tsx b/shared-helpers/src/views/sign-in/FormSignInDefault.tsx
index ffd92bda72..08744cfbdb 100644
--- a/shared-helpers/src/views/sign-in/FormSignInDefault.tsx
+++ b/shared-helpers/src/views/sign-in/FormSignInDefault.tsx
@@ -1,9 +1,10 @@
 import React, { useContext } from "react"
 import { useRouter } from "next/router"
 import type { UseFormMethods } from "react-hook-form"
-import { Field, Form, NavigationContext, t } from "@bloom-housing/ui-components"
-import { Button } from "@bloom-housing/ui-seeds"
+import { Field, t } from "@bloom-housing/ui-components"
+import { Button, Link } from "@bloom-housing/ui-seeds"
 import { getListingRedirectUrl } from "../../utilities/getListingRedirectUrl"
+import { Form } from "../components/Form"
 import styles from "./FormSignIn.module.scss"
 
 export type FormSignInDefaultProps = {
@@ -31,7 +32,6 @@ const FormSignInDefault = ({
   const onError = () => {
     window.scrollTo(0, 0)
   }
-  const { LinkComponent } = useContext(NavigationContext)
   const router = useRouter()
   const listingIdRedirect = router.query?.listingId as string
   const forgetPasswordURL = getListingRedirectUrl(listingIdRedirect, "/forgot-password")
@@ -49,23 +49,25 @@ const FormSignInDefault = ({
         register={register}
         dataTestId="sign-in-email-field"
       />
-      <aside>
-        <LinkComponent href={forgetPasswordURL} className={styles["forgot-password"]}>
-          {t("authentication.signIn.forgotPassword")}
-        </LinkComponent>
-      </aside>
-      <Field
-        className={styles["sign-in-password-input"]}
-        name="password"
-        label={t("authentication.createAccount.password")}
-        labelClassName="text__caps-spaced"
-        validation={{ required: true }}
-        error={errors.password}
-        errorMessage={t("authentication.signIn.enterLoginPassword")}
-        register={register}
-        type={"password"}
-        dataTestId="sign-in-password-field"
-      />
+      <div className={styles["password-grid"]}>
+        <Field
+          className={styles["sign-in-password-input"]}
+          name="password"
+          label={t("authentication.createAccount.password")}
+          labelClassName="text__caps-spaced"
+          validation={{ required: true }}
+          error={errors.password}
+          errorMessage={t("authentication.signIn.enterLoginPassword")}
+          register={register}
+          type={"password"}
+          dataTestId="sign-in-password-field"
+        />
+        <aside className={styles["forgot-password-wrapper"]}>
+          <Link href={forgetPasswordURL} className={styles["forgot-password"]}>
+            {t("authentication.signIn.forgotPassword")}
+          </Link>
+        </aside>
+      </div>
       <div className={styles["sign-in-action"]}>
         <Button
           type="submit"
diff --git a/shared-helpers/src/views/sign-in/FormSignInPwdless.tsx b/shared-helpers/src/views/sign-in/FormSignInPwdless.tsx
index 3c8fa7f35a..c3179907c9 100644
--- a/shared-helpers/src/views/sign-in/FormSignInPwdless.tsx
+++ b/shared-helpers/src/views/sign-in/FormSignInPwdless.tsx
@@ -1,9 +1,10 @@
 import React, { useContext } from "react"
 import { useRouter } from "next/router"
 import type { UseFormMethods } from "react-hook-form"
-import { Field, Form, NavigationContext, t } from "@bloom-housing/ui-components"
-import { Button } from "@bloom-housing/ui-seeds"
+import { Field, t } from "@bloom-housing/ui-components"
+import { Button, Link } from "@bloom-housing/ui-seeds"
 import { getListingRedirectUrl } from "../../utilities/getListingRedirectUrl"
+import { Form } from "../components/Form"
 import styles from "./FormSignIn.module.scss"
 
 export type FormSignInPwdlessProps = {
@@ -35,7 +36,6 @@ const FormSignInPwdless = ({
   const onError = () => {
     window.scrollTo(0, 0)
   }
-  const { LinkComponent } = useContext(NavigationContext)
   const router = useRouter()
   const listingIdRedirect = router.query?.listingId as string
   const forgetPasswordURL = getListingRedirectUrl(listingIdRedirect, "/forgot-password")
@@ -56,12 +56,7 @@ const FormSignInPwdless = ({
       />
 
       {!useCode && (
-        <>
-          <aside>
-            <LinkComponent href={forgetPasswordURL} className={styles["forgot-password"]}>
-              {t("authentication.signIn.forgotPassword")}
-            </LinkComponent>
-          </aside>
+        <div className={styles["password-grid"]}>
           <Field
             className={styles["sign-in-password-input"]}
             name="password"
@@ -74,7 +69,12 @@ const FormSignInPwdless = ({
             type={"password"}
             dataTestId="sign-in-password-field"
           />
-        </>
+          <aside className={styles["forgot-password-wrapper"]}>
+            <Link href={forgetPasswordURL} className={styles["forgot-password"]}>
+              {t("authentication.signIn.forgotPassword")}
+            </Link>
+          </aside>
+        </div>
       )}
       <div className={styles["sign-in-action"]}>
         <Button
diff --git a/shared-helpers/src/views/sign-in/ResendConfirmationModal.tsx b/shared-helpers/src/views/sign-in/ResendConfirmationModal.tsx
index 9c3ad3c638..0370da171c 100644
--- a/shared-helpers/src/views/sign-in/ResendConfirmationModal.tsx
+++ b/shared-helpers/src/views/sign-in/ResendConfirmationModal.tsx
@@ -1,8 +1,9 @@
-import { t, Form, Field } from "@bloom-housing/ui-components"
+import { t, Field } from "@bloom-housing/ui-components"
 import { Button, Dialog } from "@bloom-housing/ui-seeds"
 import React, { useCallback, useEffect, useMemo } from "react"
 import { useForm } from "react-hook-form"
 import { emailRegex } from "../../utilities/regex"
+import { Form } from "../components/Form"
 
 export type ResendConfirmationModalProps = {
   isOpen: boolean
diff --git a/sites/partners/src/components/users/FormSignIn.module.scss b/sites/partners/src/components/users/FormSignIn.module.scss
new file mode 100644
index 0000000000..0a70661e7c
--- /dev/null
+++ b/sites/partners/src/components/users/FormSignIn.module.scss
@@ -0,0 +1,7 @@
+.sign-in-error-container {
+  margin-inline: var(--seeds-s4);
+
+  @media (min-width: theme("screens.sm")) {
+    margin-inline: var(--seeds-s12);
+  }
+}
\ No newline at end of file
diff --git a/sites/partners/src/components/users/FormSignInAddPhone.tsx b/sites/partners/src/components/users/FormSignInAddPhone.tsx
index 780f38db23..2194d3053c 100644
--- a/sites/partners/src/components/users/FormSignInAddPhone.tsx
+++ b/sites/partners/src/components/users/FormSignInAddPhone.tsx
@@ -1,15 +1,9 @@
 import React from "react"
-import {
-  Form,
-  FormCard,
-  t,
-  PhoneField,
-  FormSignInErrorBox,
-  NetworkStatus,
-} from "@bloom-housing/ui-components"
-import { Button, Icon } from "@bloom-housing/ui-seeds"
+import { t, PhoneField } from "@bloom-housing/ui-components"
+import { Button, Card } from "@bloom-housing/ui-seeds"
 import type { UseFormMethods } from "react-hook-form"
-import { CustomIconMap } from "@bloom-housing/shared-helpers"
+import { BloomCard, Form, FormSignInErrorBox, NetworkStatus } from "@bloom-housing/shared-helpers"
+import styles from "./FormSignIn.module.scss"
 
 export type FormSignInAddPhoneProps = {
   control: FormSignInAddPhoneControl
@@ -39,20 +33,19 @@ const FormSignInAddPhone = ({
   }
   const { errors, handleSubmit } = control
   return (
-    <FormCard>
-      <div className="form-card__lead text-center">
-        <Icon size="2xl">{CustomIconMap.profile}</Icon>
-        <h2 className="form-card__title is-borderless">{t("nav.signInMFA.addNumber")}</h2>
-        <p className="form-card__sub-title">{t("nav.signInMFA.addNumberSecondaryTitle")}</p>
-      </div>
-      <FormSignInErrorBox
-        errors={errors}
-        networkStatus={networkError}
-        errorMessageId={"add-phone"}
-      />
-
-      <div className="form-card__group pt-0">
-        <Form id="sign-in-mfa" className="mt-10" onSubmit={handleSubmit(onSubmit, onError)}>
+    <BloomCard
+      title={t("nav.signInMFA.addNumber")}
+      subtitle={t("nav.signInMFA.addNumberSecondaryTitle")}
+      iconSymbol="profile"
+    >
+      <Form id="sign-in-mfa" onSubmit={handleSubmit(onSubmit, onError)}>
+        <FormSignInErrorBox
+          errors={errors}
+          networkStatus={networkError}
+          errorMessageId={"add-phone"}
+          className={styles["sign-in-error-container"]}
+        />
+        <Card.Section>
           <PhoneField
             label={t("nav.signInMFA.phoneNumber")}
             caps={true}
@@ -66,15 +59,16 @@ const FormSignInAddPhone = ({
             dataTestId={"sign-in-phone-number-field"}
             defaultValue={phoneNumber}
           />
-
-          <div className="text-center mt-10">
+        </Card.Section>
+        <Card.Footer>
+          <Card.Section>
             <Button type="submit" variant="primary" id="request-mfa-code-and-add-phone">
               {t("nav.signInMFA.addPhoneNumber")}
             </Button>
-          </div>
-        </Form>
-      </div>
-    </FormCard>
+          </Card.Section>
+        </Card.Footer>
+      </Form>
+    </BloomCard>
   )
 }
 
diff --git a/sites/partners/src/components/users/FormSignInMFACode.tsx b/sites/partners/src/components/users/FormSignInMFACode.tsx
index dcd5da8764..35b181308c 100644
--- a/sites/partners/src/components/users/FormSignInMFACode.tsx
+++ b/sites/partners/src/components/users/FormSignInMFACode.tsx
@@ -1,15 +1,14 @@
 import React from "react"
+import { Field, t } from "@bloom-housing/ui-components"
+import { Button, Card } from "@bloom-housing/ui-seeds"
 import {
-  Field,
+  BloomCard,
   Form,
-  FormCard,
-  t,
+  FormSignInControl,
   FormSignInErrorBox,
   NetworkStatus,
-  FormSignInControl,
-} from "@bloom-housing/ui-components"
-import { Button, Icon } from "@bloom-housing/ui-seeds"
-import { CustomIconMap } from "@bloom-housing/shared-helpers"
+} from "@bloom-housing/shared-helpers"
+import styles from "./FormSignIn.module.scss"
 
 export enum RequestType {
   email = "email",
@@ -57,24 +56,23 @@ const FormSignInMFACode = ({
   }
 
   return (
-    <FormCard>
-      <div className="form-card__lead text-center">
-        <Icon size="2xl">{CustomIconMap.profile}</Icon>
-        <h2 className="form-card__title is-borderless">{t("nav.signInMFA.verifyTitle")}</h2>
-        <p className="form-card__sub-title">
-          {mfaType === RequestType.sms
-            ? t("nav.signInMFA.haveSentCodeToPhone")
-            : t("nav.signInMFA.haveSentCodeToEmail")}
-        </p>
-      </div>
-      <FormSignInErrorBox
-        errors={errors}
-        networkStatus={networkError}
-        errorMessageId={"mfa-code"}
-      />
-
-      <div className="form-card__group pt-0">
-        <Form id="sign-in-mfa" className="mt-10" onSubmit={handleSubmit(onSubmit, onError)}>
+    <BloomCard
+      title={t("nav.signInMFA.verifyTitle")}
+      subtitle={
+        mfaType === RequestType.sms
+          ? t("nav.signInMFA.haveSentCodeToPhone")
+          : t("nav.signInMFA.haveSentCodeToEmail")
+      }
+      iconSymbol="profile"
+    >
+      <Form id="sign-in-mfa" onSubmit={handleSubmit(onSubmit, onError)}>
+        <FormSignInErrorBox
+          errors={errors}
+          networkStatus={networkError}
+          errorMessageId={"mfa-code"}
+          className={styles["sign-in-error-container"]}
+        />
+        <Card.Section>
           <Field
             caps={true}
             name="mfaCode"
@@ -86,14 +84,16 @@ const FormSignInMFACode = ({
             dataTestId="sign-in-mfa-code-field"
             note={note}
           />
-          <div className="text-center mt-10">
+        </Card.Section>
+        <Card.Footer>
+          <Card.Section>
             <Button type="submit" variant="primary" id="verify-and-sign-in">
               {t("nav.signInMFA.signIn")}
             </Button>
-          </div>
-        </Form>
-      </div>
-    </FormCard>
+          </Card.Section>
+        </Card.Footer>
+      </Form>
+    </BloomCard>
   )
 }
 
diff --git a/sites/partners/src/components/users/FormSignInMFAType.tsx b/sites/partners/src/components/users/FormSignInMFAType.tsx
index 6cf8a30b21..b666e4a725 100644
--- a/sites/partners/src/components/users/FormSignInMFAType.tsx
+++ b/sites/partners/src/components/users/FormSignInMFAType.tsx
@@ -1,31 +1,23 @@
 import React from "react"
+import { Field, t } from "@bloom-housing/ui-components"
+import { Button, Card } from "@bloom-housing/ui-seeds"
 import {
-  Field,
+  BloomCard,
   Form,
-  FormCard,
-  t,
+  FormSignInControl,
   FormSignInErrorBox,
   NetworkStatus,
-} from "@bloom-housing/ui-components"
-import { Button, Icon } from "@bloom-housing/ui-seeds"
-import type { UseFormMethods } from "react-hook-form"
-import { CustomIconMap } from "@bloom-housing/shared-helpers"
+} from "@bloom-housing/shared-helpers"
+import styles from "./FormSignIn.module.scss"
 
 export type FormSignInMFAProps = {
-  control: FormSignInMFAControl
+  control: FormSignInControl
   onSubmit: (data: unknown) => void
   networkError: NetworkStatus
   emailOnClick: () => void
   smsOnClick: () => void
 }
 
-export type FormSignInMFAControl = {
-  errors: UseFormMethods["errors"]
-  handleSubmit: UseFormMethods["handleSubmit"]
-  register: UseFormMethods["register"]
-  setValue: UseFormMethods["setValue"]
-}
-
 const FormSignInMFAType = ({
   onSubmit,
   networkError,
@@ -37,40 +29,37 @@ const FormSignInMFAType = ({
     window.scrollTo(0, 0)
   }
 
+  const subTitle = process.env.showSmsMfa ? t("nav.signInMFA.verificationChoiceSecondaryTitle") : undefined
+
   return (
-    <FormCard>
-      <div className="form-card__lead text-center">
-        <Icon size="2xl">{CustomIconMap.profile}</Icon>
-        <h2 className="form-card__title is-borderless">
-          {t("nav.signInMFA.verificationChoiceMainTitle")}
-        </h2>
-        {process.env.showSmsMfa && (
-          <p className="form-card__sub-title">
-            {t("nav.signInMFA.verificationChoiceSecondaryTitle")}
-          </p>
+    <BloomCard title={t("nav.signInMFA.verificationChoiceMainTitle")} iconSymbol="profile">
+      <Form id="sign-in-mfa" onSubmit={handleSubmit(onSubmit, onError)}>
+        <FormSignInErrorBox
+          errors={errors}
+          networkStatus={networkError}
+          errorMessageId={"mfa-type"}
+          className={styles["sign-in-error-container"]}
+        />
+
+        {subTitle && (
+          <Card.Section>
+            <p>{subTitle}</p>
+          </Card.Section>
         )}
-      </div>
-      <FormSignInErrorBox
-        errors={errors}
-        networkStatus={networkError}
-        errorMessageId={"mfa-type"}
-      />
 
-      <div className="form-card__group pt-0">
-        <Form id="sign-in-mfa" className="mt-10" onSubmit={handleSubmit(onSubmit, onError)}>
-          <Field
-            caps={true}
-            name="mfaType"
-            label={"MFA Type"}
-            validation={{ required: true }}
-            error={errors.mfaType}
-            errorMessage={t("nav.signInMFA.noMFAType")}
-            register={register}
-            dataTestId="sign-in-mfaType-field"
-            hidden={true}
-          />
+        <Field
+          name="mfaType"
+          label={"MFA Type"}
+          validation={{ required: true }}
+          error={errors.mfaType}
+          errorMessage={t("nav.signInMFA.noMFAType")}
+          register={register}
+          dataTestId="sign-in-mfaType-field"
+          hidden={true}
+        />
 
-          <div className="text-center mt-6">
+        <Card.Footer>
+          <Card.Section>
             <Button
               type="submit"
               variant="primary-outlined"
@@ -79,9 +68,9 @@ const FormSignInMFAType = ({
             >
               {t("nav.signInMFA.verifyByEmail")}
             </Button>
-          </div>
+          </Card.Section>
           {process.env.showSmsMfa && (
-            <div className="text-center mt-6">
+            <Card.Section>
               <Button
                 type="submit"
                 variant="primary-outlined"
@@ -90,11 +79,11 @@ const FormSignInMFAType = ({
               >
                 {t("nav.signInMFA.verifyByPhone")}
               </Button>
-            </div>
+            </Card.Section>
           )}
-        </Form>
-      </div>
-    </FormCard>
+        </Card.Footer>
+      </Form>
+    </BloomCard>
   )
 }
 
diff --git a/sites/partners/src/components/users/FormTerms.tsx b/sites/partners/src/components/users/FormTerms.tsx
index 53c9705fa3..36c403a2bc 100644
--- a/sites/partners/src/components/users/FormTerms.tsx
+++ b/sites/partners/src/components/users/FormTerms.tsx
@@ -1,9 +1,9 @@
 import React from "react"
-import { Field, Form, FormCard, MarkdownSection, t } from "@bloom-housing/ui-components"
-import { Button, Icon } from "@bloom-housing/ui-seeds"
-import Cog8ToothIcon from "@heroicons/react/24/solid/Cog8ToothIcon"
+import { Field, t } from "@bloom-housing/ui-components"
+import { Button, Card } from "@bloom-housing/ui-seeds"
 import Markdown from "markdown-to-jsx"
 import { useForm } from "react-hook-form"
+import { BloomCard, Form } from "@bloom-housing/shared-helpers"
 
 type FormTermsInValues = {
   agree: boolean
@@ -19,32 +19,26 @@ const FormTerms = (props: FormTermsProps) => {
   const { handleSubmit, register, errors } = useForm<FormTermsInValues>()
 
   return (
-    <Form id="terms" className="mt-10" onSubmit={handleSubmit(props.onSubmit)}>
-      <FormCard>
-        <div className="form-card__lead text-center">
-          <Icon size="2xl">
-            <Cog8ToothIcon />
-          </Icon>
-          <h2 className="form-card__title">{t(`authentication.terms.reviewToc`)}</h2>
-          <p className="field-note mt-4 text-center">
-            {t(`authentication.terms.youMustAcceptToc`)}
-          </p>
-
-          <div className="overflow-y-auto max-h-96 mt-5 pr-4 text-left">
+    <BloomCard
+      iconSymbol="cog"
+      title={t(`authentication.terms.reviewToc`)}
+      subtitle={t(`authentication.terms.youMustAcceptToc`)}
+    >
+      <Form id="terms" disableSubmitOnEnter onSubmit={handleSubmit(props.onSubmit)}>
+        <Card.Section>
+          <div className="overflow-y-auto max-h-96 pr-4">
             {props.terms && (
-              <MarkdownSection padding={false} fullwidth={true}>
-                <Markdown options={{ disableParsingRawHTML: false }}>{props.terms}</Markdown>
-              </MarkdownSection>
+              <Markdown className="bloom-markdown" options={{ disableParsingRawHTML: false }}>
+                {props.terms}
+              </Markdown>
             )}
           </div>
-        </div>
-
-        <div className="form-card__group pt-0">
+        </Card.Section>
+        <Card.Section>
           <Field
             id="agree"
             name="agree"
             type="checkbox"
-            className="flex flex-col justify-center items-center"
             label={t(`authentication.terms.acceptToc`)}
             register={register}
             validation={{ required: true }}
@@ -52,19 +46,16 @@ const FormTerms = (props: FormTermsProps) => {
             errorMessage={t("errors.agreeError")}
             dataTestId="agree"
           />
-        </div>
-
-        <div className="border-b" />
-
-        <div className="form-card__pager">
-          <div className="form-card__pager-row primary">
+        </Card.Section>
+        <Card.Footer>
+          <Card.Section>
             <Button type="submit" variant="primary" id="form-submit">
               {t("t.submit")}
             </Button>
-          </div>
-        </div>
-      </FormCard>
-    </Form>
+          </Card.Section>
+        </Card.Footer>
+      </Form>
+    </BloomCard>
   )
 }
 
diff --git a/sites/partners/src/components/users/FormUserConfirm.tsx b/sites/partners/src/components/users/FormUserConfirm.tsx
index 594eded05a..7be639e3ad 100644
--- a/sites/partners/src/components/users/FormUserConfirm.tsx
+++ b/sites/partners/src/components/users/FormUserConfirm.tsx
@@ -1,12 +1,17 @@
 import React, { useRef, useContext, useEffect, useState } from "react"
 import { useRouter } from "next/router"
-import { t, FormCard, Form, Field, useMutate, AlertBox } from "@bloom-housing/ui-components"
-import { Button, Dialog, Icon } from "@bloom-housing/ui-seeds"
-import { AuthContext, MessageContext, passwordRegex } from "@bloom-housing/shared-helpers"
+import { t, Field, useMutate } from "@bloom-housing/ui-components"
+import { Alert, Button, Card, Dialog } from "@bloom-housing/ui-seeds"
+import {
+  AuthContext,
+  BloomCard,
+  Form,
+  MessageContext,
+  passwordRegex,
+} from "@bloom-housing/shared-helpers"
 import { useForm } from "react-hook-form"
 import { ReRequestConfirmation } from "./ReRequestConfirmation"
 import { SuccessDTO } from "@bloom-housing/shared-helpers/src/types/backend-swagger"
-import Cog8ToothIcon from "@heroicons/react/24/solid/Cog8ToothIcon"
 
 type FormUserConfirmFields = {
   password: string
@@ -81,44 +86,38 @@ const FormUserConfirm = () => {
 
   if (!token) {
     return (
-      <FormCard>
-        <div className="form-card__group is-borderless">
-          {t(`authentication.createAccount.errors.tokenMissing`)}
-        </div>
-      </FormCard>
+      <Card>
+        <Card.Section>{t(`authentication.createAccount.errors.tokenMissing`)}</Card.Section>
+      </Card>
     )
   }
 
   return (
     <>
-      <FormCard>
-        <div className="form-card__lead text-center border-b mx-0 px-5">
-          <Icon size="2xl">
-            <Cog8ToothIcon />
-          </Icon>
-          <h2 className="form-card__title">{t("users.addPassword")}</h2>
-          <p className="mt-4 field-note">{t("users.needUniquePassword")}</p>
-
-          {isError && (
-            <AlertBox className="mt-5" type="alert" closeable>
-              {t(`errors.alert.badRequest`)}
-            </AlertBox>
-          )}
-
-          {newConfirmationRequested && (
-            <AlertBox className="mt-5" type="success" closeable>
-              {t(`users.confirmationSent`)}
-            </AlertBox>
-          )}
-        </div>
-
+      <BloomCard
+        title={t("users.addPassword")}
+        subtitle={t("users.needUniquePassword")}
+        iconSymbol={"cog"}
+      >
         <Form id="update-password" onSubmit={handleSubmit(onSubmit)}>
-          <div className="form-card__group is-borderless">
+          <Card.Section>
+            {isError && (
+              <Alert variant="alert" fullwidth className="spacer-content">
+                {t(`errors.alert.badRequest`)}
+              </Alert>
+            )}
+
+            {newConfirmationRequested && (
+              <Alert variant="success" fullwidth className="spacer-content">
+                {t(`users.confirmationSent`)}
+              </Alert>
+            )}
+
             <fieldset>
-              <legend className="text__caps-spaced">
+              <legend className="seeds-m-be-text">
                 {t("authentication.createAccount.password")}
               </legend>
-              <p className="field-note mb-4">{t("users.makeNote")}</p>
+              <p className="field-note">{t("users.makeNote")}</p>
 
               <div className="mt-5">
                 <Field
@@ -162,10 +161,9 @@ const FormUserConfirm = () => {
                 />
               </div>
             </fieldset>
-          </div>
-
-          <div className="form-card__pager mt-8">
-            <div className="form-card__pager-row primary">
+          </Card.Section>
+          <Card.Footer>
+            <Card.Section>
               <Button
                 type="submit"
                 variant="primary"
@@ -176,10 +174,10 @@ const FormUserConfirm = () => {
               >
                 {t("users.confirmAccount")}
               </Button>
-            </div>
-          </div>
+            </Card.Section>
+          </Card.Footer>
         </Form>
-      </FormCard>
+      </BloomCard>
 
       <Dialog
         isOpen={rerequestModalOpen}
diff --git a/sites/partners/src/lib/users/signInHelpers.ts b/sites/partners/src/lib/users/signInHelpers.ts
index 30fa751d08..d099f9e267 100644
--- a/sites/partners/src/lib/users/signInHelpers.ts
+++ b/sites/partners/src/lib/users/signInHelpers.ts
@@ -104,17 +104,23 @@ export const onSubmitMfaCodeWithPhone =
     mfaType,
     setRenderStep,
     requestMfaCode,
+    determineNetworkError,
     setAllowPhoneNumberEdit,
     setPhoneNumber,
     resetNetworkError
   ) =>
   async (data: { phoneNumber: string }) => {
     const { phoneNumber } = data
-    await requestMfaCode(email, password, mfaType, phoneNumber)
-    resetNetworkError()
-    setRenderStep(EnumRenderStep.enterCode)
-    setAllowPhoneNumberEdit(true)
-    setPhoneNumber(phoneNumber)
+    try {
+      await requestMfaCode(email, password, mfaType, phoneNumber)
+      resetNetworkError()
+      setRenderStep(EnumRenderStep.enterCode)
+      setAllowPhoneNumberEdit(true)
+      setPhoneNumber(phoneNumber)
+    } catch(error) {
+      const { status } = error.response || {}
+      determineNetworkError(status, error, true)
+    }
   }
 
 export const onSubmitMfaCode =
diff --git a/sites/partners/src/pages/reset-password.tsx b/sites/partners/src/pages/reset-password.tsx
index d71e5bb8e2..14d0b2b8b6 100644
--- a/sites/partners/src/pages/reset-password.tsx
+++ b/sites/partners/src/pages/reset-password.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useContext, useRef } from "react"
 import { useRouter } from "next/router"
 import { useForm } from "react-hook-form"
-import { Button, Icon } from "@bloom-housing/ui-seeds"
-import { Field, Form, FormCard, t, AlertBox } from "@bloom-housing/ui-components"
-import { AuthContext, CustomIconMap, MessageContext } from "@bloom-housing/shared-helpers"
+import { Alert, Button, Card } from "@bloom-housing/ui-seeds"
+import { Field, t } from "@bloom-housing/ui-components"
+import { AuthContext, BloomCard, Form, MessageContext } from "@bloom-housing/shared-helpers"
 import FormsLayout from "../layouts/forms"
 
 const ResetPassword = () => {
@@ -42,18 +42,13 @@ const ResetPassword = () => {
 
   return (
     <FormsLayout title={`Reset Password - ${t("nav.siteTitlePartners")}`}>
-      <FormCard>
-        <div className="form-card__lead text-center border-b mx-0">
-          <Icon size="2xl">{CustomIconMap.profile}</Icon>
-          <h2 className="form-card__title">{t("authentication.forgotPassword.changePassword")}</h2>
-        </div>
-        {requestError && (
-          <AlertBox className="" onClose={() => setRequestError(undefined)} type="alert">
-            {requestError}
-          </AlertBox>
-        )}
-        <div className="form-card__group pt-0 border-b">
-          <Form id="sign-in" className="mt-10" onSubmit={handleSubmit(onSubmit)}>
+      <BloomCard iconSymbol="profile" title={t("authentication.forgotPassword.changePassword")}>
+        <Form id="sign-in" onSubmit={handleSubmit(onSubmit)}>
+          <Card.Section>
+            {requestError && (
+              <Alert variant="alert" fullwidth className="spacer-content" onClose={() => setRequestError(undefined)}>{requestError}</Alert>
+            )}
+
             <Field
               name="password"
               label={t("authentication.createAccount.password")}
@@ -78,15 +73,16 @@ const ResetPassword = () => {
               type="password"
               labelClassName={"text__caps-spaced"}
             />
-
-            <div className="text-center mt-6">
+          </Card.Section>
+          <Card.Footer>
+            <Card.Section>
               <Button type="submit" variant="primary">
                 {t("authentication.forgotPassword.changePassword")}
               </Button>
-            </div>
-          </Form>
-        </div>
-      </FormCard>
+            </Card.Section>
+          </Card.Footer>
+        </Form>
+      </BloomCard>
     </FormsLayout>
   )
 }
diff --git a/sites/partners/src/pages/sign-in.tsx b/sites/partners/src/pages/sign-in.tsx
index f2fcebd03a..d4bed2ff9e 100644
--- a/sites/partners/src/pages/sign-in.tsx
+++ b/sites/partners/src/pages/sign-in.tsx
@@ -191,9 +191,9 @@ const SignIn = () => {
         )}
         emailOnClick={() => setValue("mfaType", MfaType.email)}
         smsOnClick={() => setValue("mfaType", MfaType.sms)}
-        control={{ register, errors, handleSubmit, setValue }}
+        control={{ register, errors, handleSubmit }}
         networkError={{
-          content: { ...networkError, error: !!networkError?.error },
+          content: { ...networkError },
           reset: resetNetworkError,
         }}
       />
@@ -207,13 +207,14 @@ const SignIn = () => {
           mfaType,
           setRenderStep,
           requestMfaCode,
+          determineNetworkError,
           setAllowPhoneNumberEdit,
           setPhoneNumber,
           resetNetworkError
         )}
         control={{ errors, handleSubmit, control }}
         networkError={{
-          content: { ...networkError, error: !!networkError?.error },
+          content: { ...networkError },
           reset: resetNetworkError,
         }}
         phoneNumber={phoneNumber}
@@ -233,7 +234,7 @@ const SignIn = () => {
         )}
         control={{ register, errors, handleSubmit, watch }}
         networkError={{
-          content: { ...networkError, error: !!networkError?.error },
+          content: { ...networkError },
           reset: resetNetworkError,
         }}
         mfaType={mfaType}
diff --git a/sites/partners/src/pages/users/confirm.tsx b/sites/partners/src/pages/users/confirm.tsx
index 86cad21284..cbe7e61b2b 100644
--- a/sites/partners/src/pages/users/confirm.tsx
+++ b/sites/partners/src/pages/users/confirm.tsx
@@ -1,22 +1,13 @@
 import React from "react"
-import Head from "next/head"
-import Layout from "../../layouts"
 import { t } from "@bloom-housing/ui-components"
+import FormsLayout from "../../layouts/forms"
 import { FormUserConfirm } from "../../components/users/FormUserConfirm"
 
 const ConfirmPage = () => {
   return (
-    <Layout>
-      <Head>
-        <title>{`User Confirm - ${t("nav.siteTitlePartners")}`}</title>
-      </Head>
-
-      <div className="md:mb-20 md:mt-12 mx-auto max-w-lg print:my-0 print:max-w-full">
-        <div className="mt-12">
-          <FormUserConfirm />
-        </div>
-      </div>
-    </Layout>
+    <FormsLayout title={`User Confirm - ${t("nav.siteTitlePartners")}`}>
+      <FormUserConfirm />
+    </FormsLayout>
   )
 }
 
diff --git a/sites/partners/styles/overrides.scss b/sites/partners/styles/overrides.scss
index 7b2707cdd0..225e287e0d 100644
--- a/sites/partners/styles/overrides.scss
+++ b/sites/partners/styles/overrides.scss
@@ -25,6 +25,40 @@
   .seeds-button[data-variant="primary"] {
     color: white; // AG grid styling from UIC was messing up our primary button
   }
+
+  .bloom-markdown { // copied over from public
+    &,
+    > * {
+      overflow-wrap: anywhere;
+    }
+
+    p:not(li > *) {
+      padding-block: 0.25em;
+    }
+
+    ul {
+      list-style: disc;
+    }
+
+    ol {
+      list-style: decimal;
+    }
+    ul,
+    ol {
+      margin-inline-start: var(--seeds-s5);
+      margin-block-end: 0.5em;
+    }
+
+    hr {
+      margin-block: var(--seeds-spacer-label);
+      width: 100%;
+    }
+
+    a {
+      color: var(--seeds-color-blue-500);
+      text-decoration: underline;
+    }
+  }
 }
 
 .section-with-grid hgroup p {