diff --git a/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx b/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx
index 3e9d040ae21..92bc0850ef8 100644
--- a/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx
@@ -26,6 +26,11 @@ const schema = z.object({
 
 const formId = 'sign-in-mfa-form'
 
+function getFactorDisplayName(factor: Pick<Factor, 'friendly_name'> | null | undefined): string {
+  const name = factor?.friendly_name?.trim()
+  return name && name.length > 0 ? name : 'your authenticator app'
+}
+
 interface SignInMfaFormProps {
   context?: 'forgot-password' | 'sign-in'
 }
@@ -142,9 +147,14 @@ export const SignInMfaForm = ({ context = 'sign-in' }: SignInMfaFormProps) => {
                 <FormItemLayout
                   name="code"
                   label={
-                    selectedFactor && factors?.totp.length === 2
-                      ? `Code generated by ${selectedFactor.friendly_name}`
-                      : null
+                    selectedFactor ? (
+                      <>
+                        Code generated by{' '}
+                        <strong className="text-foreground">
+                          {getFactorDisplayName(selectedFactor)}
+                        </strong>
+                      </>
+                    ) : null
                   }
                 >
                   <FormControl>
@@ -208,9 +218,13 @@ export const SignInMfaForm = ({ context = 'sign-in' }: SignInMfaFormProps) => {
                 onClick={() =>
                   setSelectedFactor(factors.totp.find((f) => f.id !== selectedFactor?.id)!)
                 }
-              >{`Authenticate using ${
-                factors.totp.find((f) => f.id !== selectedFactor?.id)?.friendly_name
-              }?`}</a>
+              >
+                Authenticate using{' '}
+                <strong className="text-foreground">
+                  {getFactorDisplayName(factors.totp.find((f) => f.id !== selectedFactor?.id))}
+                </strong>
+                ?
+              </a>
             </li>
           )}
           <li>