diff --git a/apps/frontend/src/pages/servers/index.vue b/apps/frontend/src/pages/servers/index.vue
index 9030c0e01..9ccd98e89 100644
--- a/apps/frontend/src/pages/servers/index.vue
+++ b/apps/frontend/src/pages/servers/index.vue
@@ -520,27 +520,19 @@
           </OptionGroup>
           <template v-if="billingPeriods.includes('quarterly')">
             <button
-              v-if="billingPeriod !== 'quarterly'"
               class="bg-transparent p-0 text-sm font-medium text-brand hover:underline active:scale-95"
               @click="billingPeriod = 'quarterly'"
             >
               Save 16% with quarterly billing!
             </button>
-            <span v-else class="text-sm font-medium text-primary">
-              Saving 16% with quarterly billing!
-            </span>
           </template>
           <template v-else-if="billingPeriods.includes('yearly')">
             <button
-              v-if="billingPeriod !== 'yearly'"
               class="bg-transparent p-0 text-sm font-medium text-brand hover:underline active:scale-95"
               @click="billingPeriod = 'yearly'"
             >
               Save 16% with yearly billing!
             </button>
-            <span v-else class="text-sm font-medium text-primary">
-              Saving 16% with yearly billing!
-            </span>
           </template>
           <span v-else></span>
         </div>
@@ -639,7 +631,7 @@ import LoaderIcon from "~/components/ui/servers/icons/LoaderIcon.vue";
 import ServerPlanSelector from "~/components/ui/servers/marketing/ServerPlanSelector.vue";
 import OptionGroup from "~/components/ui/OptionGroup.vue";
 
-const billingPeriods = ref(["monthly", "yearly"]);
+const billingPeriods = ref(["monthly", "quarterly"]);
 const billingPeriod = ref(billingPeriods.value.includes("quarterly") ? "quarterly" : "monthly");
 
 const pyroProducts = products.filter((p) => p.metadata.type === "pyro");
diff --git a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
index bdd3fc9ed..b988105f8 100644
--- a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
+++ b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
@@ -8,6 +8,7 @@ import {
   RightArrowIcon,
   XIcon,
   CheckCircleIcon,
+  SpinnerIcon,
 } from '@modrinth/assets'
 import type {
   CreatePaymentIntentRequest,
@@ -27,6 +28,7 @@ import RegionSelector from './ServersPurchase1Region.vue'
 import PaymentMethodSelector from './ServersPurchase2PaymentMethod.vue'
 import ConfirmPurchase from './ServersPurchase3Review.vue'
 import { useStripe } from '../../composables/stripe'
+import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
 
 const { formatMessage } = useVIntl()
 
@@ -49,11 +51,12 @@ const props = defineProps<{
   initiatePayment: (
     body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
   ) => Promise<UpdatePaymentIntentResponse | CreatePaymentIntentResponse>
+  onError: (err: Error) => void
 }>()
 
 const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
 const selectedPlan = ref<ServerPlan>()
-const selectedInterval = ref<ServerBillingInterval>()
+const selectedInterval = ref<ServerBillingInterval>('quarterly')
 const loading = ref(false)
 
 const {
@@ -72,21 +75,22 @@ const {
   reloadPaymentIntent,
   hasPaymentMethod,
   submitPayment,
+  completingPurchase,
 } = useStripe(
   props.publishableKey,
   props.customer,
   props.paymentMethods,
-  props.clientSecret,
   props.currency,
   selectedPlan,
   selectedInterval,
   props.initiatePayment,
-  console.error,
+  props.onError,
 )
 
 const selectedRegion = ref<string>()
 const customServer = ref<boolean>(false)
 const acceptedEula = ref<boolean>(false)
+const firstTimeThru = ref<boolean>(true)
 
 type Step = 'region' | 'payment' | 'review'
 
@@ -111,9 +115,13 @@ const currentPing = computed(() => {
 
 const currentStep = ref<Step>()
 
-const currentStepIndex = computed(() => steps.indexOf(currentStep.value))
-const previousStep = computed(() => steps[steps.indexOf(currentStep.value) - 1])
-const nextStep = computed(() => steps[steps.indexOf(currentStep.value) + 1])
+const currentStepIndex = computed(() => (currentStep.value ? steps.indexOf(currentStep.value) : -1))
+const previousStep = computed(() =>
+  currentStep.value ? steps[steps.indexOf(currentStep.value) - 1] : undefined,
+)
+const nextStep = computed(() =>
+  currentStep.value ? steps[steps.indexOf(currentStep.value) + 1] : undefined,
+)
 
 const canProceed = computed(() => {
   switch (currentStep.value) {
@@ -122,7 +130,7 @@ const canProceed = computed(() => {
     case 'payment':
       return selectedPaymentMethod.value || !loadingElements.value
     case 'review':
-      return acceptedEula.value && hasPaymentMethod.value
+      return acceptedEula.value && hasPaymentMethod.value && !completingPurchase.value
     default:
       return false
   }
@@ -135,13 +143,14 @@ async function beforeProceed(step: string) {
     case 'payment':
       await initializeStripe()
 
-      if (primaryPaymentMethodId.value) {
+      if (primaryPaymentMethodId.value && firstTimeThru.value) {
         const paymentMethod = await props.paymentMethods.find(
           (x) => x.id === primaryPaymentMethodId.value,
         )
         await selectPaymentMethod(paymentMethod)
         await setStep('review', true)
-        return true
+        firstTimeThru.value = false
+        return false
       }
       return true
     case 'review':
@@ -166,13 +175,13 @@ async function afterProceed(step: string) {
   }
 }
 
-async function setStep(step: Step, skipValidation = false) {
+async function setStep(step: Step | undefined, skipValidation = false) {
   if (!step) {
     await submitPayment(props.returnUrl)
     return
   }
 
-  if (!canProceed.value || skipValidation) {
+  if (!skipValidation && !canProceed.value) {
     return
   }
 
@@ -191,6 +200,7 @@ function begin(interval: ServerBillingInterval, plan?: ServerPlan) {
   customServer.value = !selectedPlan.value
   selectedPaymentMethod.value = undefined
   currentStep.value = steps[0]
+  firstTimeThru.value = true
   modal.value?.show()
 }
 
@@ -206,7 +216,7 @@ defineExpose({
           <button
             v-if="index < currentStepIndex"
             class="bg-transparent active:scale-95 font-bold text-secondary p-0"
-            @click="setStep(id)"
+            @click="setStep(id, true)"
           >
             {{ formatMessage(title) }}
           </button>
@@ -249,31 +259,48 @@ defineExpose({
         v-else-if="
           currentStep === 'review' &&
           hasPaymentMethod &&
-          selectedRegion &&
+          currentRegion &&
           selectedInterval &&
           selectedPlan
         "
-        ref="currentStepRef"
         v-model:interval="selectedInterval"
         v-model:accepted-eula="acceptedEula"
         :currency="currency"
         :plan="selectedPlan"
-        :region="regions.find((x) => x.shortcode === selectedRegion)"
+        :region="currentRegion"
         :ping="currentPing"
         :loading="paymentMethodLoading"
         :selected-payment-method="selectedPaymentMethod || inputtedPaymentMethod"
         :tax="tax"
         :total="total"
-        :on-error="console.error"
-        @change-payment-method="setStep('payment')"
+        @change-payment-method="setStep('payment', true)"
         @reload-payment-intent="reloadPaymentIntent"
-        @error="console.error"
       />
       <div v-else>Something went wrong</div>
+      <div
+        v-show="
+          selectedPaymentMethod === undefined &&
+          currentStep === 'payment' &&
+          selectedPlan &&
+          selectedInterval
+        "
+        class="min-h-[16rem] flex flex-col gap-2 mt-2 p-4 bg-table-alternateRow rounded-xl justify-center items-center"
+      >
+        <div v-show="loadingElements">
+          <ModalLoadingIndicator :error="loadingElementsFailed">
+            Loading...
+            <template #error> Error loading Stripe payment UI. </template>
+          </ModalLoadingIndicator>
+        </div>
+        <div class="w-full">
+          <div id="address-element"></div>
+          <div id="payment-element" class="mt-4"></div>
+        </div>
+      </div>
     </div>
     <div class="flex gap-2 justify-between mt-4">
       <ButtonStyled>
-        <button v-if="previousStep" @click="previousStep && setStep(previousStep)">
+        <button v-if="previousStep" @click="previousStep && setStep(previousStep, true)">
           <LeftArrowIcon /> {{ formatMessage(commonMessages.backButton) }}
         </button>
         <button v-else @click="modal?.hide()">
@@ -282,9 +309,10 @@ defineExpose({
         </button>
       </ButtonStyled>
       <ButtonStyled color="brand">
-        <button :disabled="!canProceed" @click="setStep(nextStep)">
+        <button v-tooltip="currentStep === 'review' && !acceptedEula ? 'You must accept the Minecraft EULA to proceed.' : undefined" :disabled="!canProceed" @click="setStep(nextStep)">
           <template v-if="currentStep === 'review'">
-            <CheckCircleIcon />
+            <SpinnerIcon v-if="completingPurchase" class="animate-spin" />
+            <CheckCircleIcon v-else />
             Subscribe
           </template>
           <template v-else>
diff --git a/packages/ui/src/components/billing/PurchaseModal.vue b/packages/ui/src/components/billing/PurchaseModal.vue
index 65d92dae3..a47499e3d 100644
--- a/packages/ui/src/components/billing/PurchaseModal.vue
+++ b/packages/ui/src/components/billing/PurchaseModal.vue
@@ -214,10 +214,10 @@
               {{ interval }}
             </span>
             <span
-              v-if="interval === 'yearly'"
+              v-if="interval === 'yearly' || interval === 'quarterly'"
               class="rounded-full bg-brand px-2 py-1 font-bold text-brand-inverted"
             >
-              SAVE {{ calculateSavings(price.prices.intervals.monthly, rawPrice) }}%
+              SAVE {{ calculateSavings(price.prices.intervals.monthly, rawPrice, interval === 'quarterly' ? 3 : 12) }}%
             </span>
             <span class="ml-auto text-lg" :class="{ 'text-secondary': selectedPlan !== interval }">
               {{ formatPrice(locale, rawPrice, price.currency_code) }}
diff --git a/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue b/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue
index f13a31ca9..ce9ff4730 100644
--- a/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue
+++ b/packages/ui/src/components/billing/ServersPurchase2PaymentMethod.vue
@@ -51,19 +51,4 @@ const messages = defineMessages({
       @select="emit('select', undefined)"
     />
   </div>
-  <div
-    v-show="selected === undefined"
-    class="min-h-[16rem] flex flex-col gap-2 mt-2 p-4 bg-table-alternateRow rounded-xl justify-center items-center"
-  >
-    <div v-show="loadingElements">
-      <ModalLoadingIndicator :error="loadingElementsFailed">
-        Loading...
-        <template #error> Error loading Stripe payment UI. </template>
-      </ModalLoadingIndicator>
-    </div>
-    <div class="w-full">
-      <div id="address-element"></div>
-      <div id="payment-element" class="mt-4"></div>
-    </div>
-  </div>
 </template>
diff --git a/packages/ui/src/components/billing/ServersPurchase3Review.vue b/packages/ui/src/components/billing/ServersPurchase3Review.vue
index 40f7d712e..5f17efc18 100644
--- a/packages/ui/src/components/billing/ServersPurchase3Review.vue
+++ b/packages/ui/src/components/billing/ServersPurchase3Review.vue
@@ -38,11 +38,10 @@ const props = defineProps<{
   ping?: number
   loading?: boolean
   selectedPaymentMethod: Stripe.PaymentMethod | undefined
-  onError: (error: Error) => void
 }>()
 
-const interval = defineModel<ServerBillingInterval>('interval')
-const acceptedEula = defineModel<boolean>('accepted-eula', { required: true })
+const interval = defineModel<ServerBillingInterval>('interval', { required: true })
+const acceptedEula = defineModel<boolean>('acceptedEula', { required: true })
 
 const prices = computed(() => {
   return props.plan.prices.find((x) => x.currency_code === props.currency)
@@ -143,14 +142,14 @@ function setInterval(newInterval: ServerBillingInterval) {
     </div>
   </div>
 
-  <div class="grid grid-cols-2 gap-2">
+  <div class="grid grid-cols-2 gap-2 mt-4">
     <button
       :class="
         interval === 'monthly'
           ? 'bg-button-bg border-transparent'
           : 'bg-transparent  border-button-border'
       "
-      class="mt-4 rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
+      class="rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
       @click="setInterval('monthly')"
     >
       <RadioButtonCheckedIcon v-if="interval === 'monthly'" class="size-6 text-brand" />
@@ -167,27 +166,27 @@ function setInterval(newInterval: ServerBillingInterval) {
     </button>
     <button
       :class="
-        interval === 'yearly'
+        interval === 'quarterly'
           ? 'bg-button-bg border-transparent'
           : 'bg-transparent  border-button-border'
       "
-      class="mt-4 rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
-      @click="setInterval('yearly')"
+      class="rounded-2xl active:scale-[0.98] transition-transform duration-100 border-2 border-solid p-4 flex items-center gap-2"
+      @click="setInterval('quarterly')"
     >
-      <RadioButtonCheckedIcon v-if="interval === 'yearly'" class="size-6 text-brand" />
+      <RadioButtonCheckedIcon v-if="interval === 'quarterly'" class="size-6 text-brand" />
       <RadioButtonIcon v-else class="size-6 text-secondary" />
       <div class="flex flex-col items-start gap-1 font-medium text-primary">
-        <span class="flex items-center gap-1" :class="{ 'text-contrast': interval === 'yearly' }"
-          >Pay yearly
+        <span class="flex items-center gap-1" :class="{ 'text-contrast': interval === 'quarterly' }"
+        >Pay quarterly
           <span class="text-xs font-bold text-brand px-1.5 py-0.5 rounded-full bg-brand-highlight"
-            >{{ interval === 'quarterly' ? 'Saving' : 'Save' }} 16%</span
+          >{{ interval === 'quarterly' ? 'Saving' : 'Save' }} 16%</span
           ></span
         >
         <span class="text-sm text-secondary flex items-center gap-1"
-          >{{
+        >{{
             formatPrice(
               locale,
-              prices?.prices?.intervals?.['yearly'] ?? 0 / monthsInInterval['yearly'],
+              prices?.prices?.intervals?.['quarterly'] ?? 0 / monthsInInterval['quarterly'],
               currency,
               true,
             )
diff --git a/packages/ui/src/composables/stripe.ts b/packages/ui/src/composables/stripe.ts
index 12144bb4a..38afecb7e 100644
--- a/packages/ui/src/composables/stripe.ts
+++ b/packages/ui/src/composables/stripe.ts
@@ -1,11 +1,8 @@
 import type Stripe from 'stripe'
-import type { StripeElementsOptionsMode } from '@stripe/stripe-js/dist/stripe-js/elements-group'
 import {
   type Stripe as StripeJs,
   loadStripe,
-  type StripeAddressElement,
   type StripeElements,
-  type StripePaymentElement,
 } from '@stripe/stripe-js'
 import { computed, ref, type Ref } from 'vue'
 import type { ContactOption } from '@stripe/stripe-js/dist/stripe-js/elements/address'
@@ -19,28 +16,28 @@ import type {
   ServerBillingInterval,
   UpdatePaymentIntentRequest,
   UpdatePaymentIntentResponse,
-} from '../../utils/billing'
+} from '../utils/billing.ts'
 
-export type CreateElements = (
-  paymentMethods: Stripe.PaymentMethod[],
-  options: StripeElementsOptionsMode,
-) => {
-  elements: StripeElements
-  paymentElement: StripePaymentElement
-  addressElement: StripeAddressElement
-}
+// export type CreateElements = (
+//   paymentMethods: Stripe.PaymentMethod[],
+//   options: StripeElementsOptionsMode,
+// ) => {
+//   elements: StripeElements
+//   paymentElement: StripePaymentElement
+//   addressElement: StripeAddressElement
+// }
 
 export const useStripe = (
   publishableKey: string,
   customer: Stripe.Customer,
   paymentMethods: Stripe.PaymentMethod[],
-  clientSecret: string,
   currency: string,
-  product: Ref<ServerPlan>,
+  product: Ref<ServerPlan | undefined>,
   interval: Ref<ServerBillingInterval>,
   initiatePayment: (
     body: CreatePaymentIntentRequest | UpdatePaymentIntentRequest,
   ) => Promise<CreatePaymentIntentResponse | UpdatePaymentIntentResponse>,
+  onError: (err: Error) => void,
 ) => {
   const stripe = ref<StripeJs | null>(null)
 
@@ -57,6 +54,8 @@ export const useStripe = (
   const submittingPayment = ref(false)
   const selectedPaymentMethod = ref<Stripe.PaymentMethod>()
   const inputtedPaymentMethod = ref<Stripe.PaymentMethod>()
+  const clientSecret = ref<string>()
+  const completingPurchase = ref<boolean>(false)
 
   async function initialize() {
     stripe.value = await loadStripe(publishableKey)
@@ -71,10 +70,10 @@ export const useStripe = (
   }
 
   const planPrices = computed(() => {
-    return product.value.prices.find((x) => x.currency_code === currency)
+    return product.value?.prices.find((x) => x.currency_code === currency)
   })
 
-  const createElements: CreateElements = (options) => {
+  const createElements = (options) => {
     const styles = getComputedStyle(document.body)
 
     if (!stripe.value) {
@@ -158,11 +157,11 @@ export const useStripe = (
   })
 
   const loadStripeElements = async () => {
-    loadingFailed.value = false
+    loadingFailed.value = undefined
     try {
-      if (!customer) {
+      if (!customer && primaryPaymentMethodId.value) {
         paymentMethodLoading.value = true
-        await props.refreshPaymentMethods()
+        await refreshPaymentIntent(primaryPaymentMethodId.value, false)
         paymentMethodLoading.value = false
       }
 
@@ -176,7 +175,7 @@ export const useStripe = (
         } = createElements({
           mode: 'payment',
           currency: currency.toLowerCase(),
-          amount: product.value.prices.find((x) => x.currency_code === currency)?.prices.intervals[
+          amount: product.value?.prices.find((x) => x.currency_code === currency)?.prices.intervals[
             interval.value
           ],
           paymentMethodCreation: 'manual',
@@ -214,6 +213,10 @@ export const useStripe = (
             id: id,
           }
 
+      if (!product.value) {
+        return handlePaymentError('No product selected')
+      }
+
       const charge: ChargeRequestType = {
         type: 'new',
         product_id: product.value?.id,
@@ -232,7 +235,7 @@ export const useStripe = (
       } else {
         ;({
           payment_intent_id: paymentIntentId.value,
-          client_secret: clientSecret,
+          client_secret: clientSecret.value,
           ...result
         } = await createIntent({
           ...requestType,
@@ -251,7 +254,7 @@ export const useStripe = (
         }
       }
     } catch (err) {
-      emit('error', err)
+      handlePaymentError(err as string)
     }
     paymentMethodLoading.value = false
   }
@@ -260,13 +263,16 @@ export const useStripe = (
     if (!elements) {
       return handlePaymentError('No elements')
     }
+    if (!stripe.value) {
+      return handlePaymentError('No stripe')
+    }
 
     const { error, confirmationToken: confirmation } = await stripe.value.createConfirmationToken({
       elements,
     })
 
     if (error) {
-      emit('error', error)
+      handlePaymentError(error.message ?? 'Unknown error creating confirmation token')
       return
     }
 
@@ -275,7 +281,8 @@ export const useStripe = (
 
   function handlePaymentError(err: string | Error) {
     paymentMethodLoading.value = false
-    emit('error', typeof err === 'string' ? new Error(err) : err)
+    completingPurchase.value = false
+    onError(typeof err === 'string' ? new Error(err) : err)
   }
 
   async function createNewPaymentMethod() {
@@ -288,7 +295,7 @@ export const useStripe = (
     const { error: submitError } = await elements.submit()
 
     if (submitError) {
-      return handlePaymentError(submitError)
+      return handlePaymentError(submitError.message ?? 'Unknown error creating payment method')
     }
 
     const token = await createConfirmationToken()
@@ -325,9 +332,20 @@ export const useStripe = (
   const loadingElements = computed(() => elementsLoaded.value < 2)
 
   async function submitPayment(returnUrl: string) {
+    completingPurchase.value = true
+    const secert = clientSecret.value
+
+    if (!secert) {
+      return handlePaymentError('No client secret')
+    }
+
+    if (!stripe.value) {
+      return handlePaymentError('No stripe')
+    }
+
     submittingPayment.value = true
     const { error } = await stripe.value.confirmPayment({
-      clientSecret,
+      clientSecret: secert,
       confirmParams: {
         confirmation_token: confirmationToken.value,
         return_url: `${returnUrl}?priceId=${product.value?.prices.find((x) => x.currency_code === currency)?.id}&plan=${interval.value}`,
@@ -335,10 +353,11 @@ export const useStripe = (
     })
 
     if (error) {
-      props.onError(error)
+      handlePaymentError(error.message ?? 'Unknown error submitting payment')
       return false
     }
     submittingPayment.value = false
+    completingPurchase.value = false
     return true
   }
 
@@ -372,5 +391,6 @@ export const useStripe = (
     tax,
     total,
     submitPayment,
+    completingPurchase
   }
 }
diff --git a/packages/utils/billing.ts b/packages/utils/billing.ts
index db2372dd7..a24e51ad9 100644
--- a/packages/utils/billing.ts
+++ b/packages/utils/billing.ts
@@ -84,10 +84,10 @@ export const formatPrice = (locale, price, currency, trimZeros = false) => {
   return formatter.format(convertedPrice)
 }
 
-export const calculateSavings = (monthlyPlan, annualPlan) => {
-  const monthlyAnnualized = monthlyPlan * 12
+export const calculateSavings = (monthlyPlan, plan, months = 12) => {
+  const monthlyAnnualized = monthlyPlan * months
 
-  return Math.floor(((monthlyAnnualized - annualPlan) / monthlyAnnualized) * 100)
+  return Math.floor(((monthlyAnnualized - plan) / monthlyAnnualized) * 100)
 }
 
 export const createStripeElements = (stripe, paymentMethods, options) => {