diff --git a/src/lib/components/mfaChallengeFormList.svelte b/src/lib/components/mfaChallengeFormList.svelte
index 3e369b2ab..00dc1ad23 100644
--- a/src/lib/components/mfaChallengeFormList.svelte
+++ b/src/lib/components/mfaChallengeFormList.svelte
@@ -95,7 +95,7 @@
 {#if enabledFactors.length > 1}
     <span class="with-separators eyebrow-heading-3">or</span>
     <div class="u-flex-vertical u-gap-8">
-        {#if factors.totp && challengeType != null && challengeType != AuthenticationFactor.Totp}
+        {#if factors.totp && challengeType !== null && challengeType !== AuthenticationFactor.Totp}
             <Button
                 secondary
                 fullWidth
diff --git a/src/routes/(console)/account/updateMfa.svelte b/src/routes/(console)/account/updateMfa.svelte
index 35e6b97d6..95bdcf10a 100644
--- a/src/routes/(console)/account/updateMfa.svelte
+++ b/src/routes/(console)/account/updateMfa.svelte
@@ -160,11 +160,11 @@
                                 <span class="icon-device-mobile" aria-hidden="true"></span>
                             </div>
                             <Layout.Stack gap="xxxs">
-                                <Layout.Stack gap="s">
+                                <Layout.Stack gap="s" direction="row">
                                     <Typography.Text variant="m-600"
                                         >Authenticator app</Typography.Text>
                                     {#if $factors.totp}
-                                        <Pill>connected</Pill>
+                                        <Badge variant="secondary" content="connected" size="s" />
                                     {/if}
                                 </Layout.Stack>
                                 <Typography.Text variant="m-400">
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 4f0d7e131..db32f3c91 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -102,9 +102,9 @@
 
     $: hasPaymentError =
         defaultPaymentMethod?.lastError ||
-        defaultPaymentMethod.expired ||
+        defaultPaymentMethod?.expired ||
         backupPaymentMethod?.lastError ||
-        backupPaymentMethod.expired;
+        backupPaymentMethod?.expired;
 </script>
 
 <CardGrid>