diff --git a/packages/ui/src/components/Listbox/Listbox2.tsx b/packages/ui/src/components/Listbox/Listbox2.tsx
index 2049efdf007..45c6ab2bdc6 100644
--- a/packages/ui/src/components/Listbox/Listbox2.tsx
+++ b/packages/ui/src/components/Listbox/Listbox2.tsx
@@ -21,7 +21,7 @@ function classNames(...classes: any) {
 export interface Props extends Omit<React.InputHTMLAttributes<HTMLButtonElement>, 'size'> {
   className?: string
   children: React.ReactNode
-  descriptionText?: string
+  descriptionText?: string | React.ReactNode
   error?: string
   icon?: any
   id?: string
diff --git a/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx b/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
index 49e793ec9eb..f9437860cc7 100644
--- a/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
+++ b/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx
@@ -103,7 +103,17 @@ const FormField: FC<Props> = ({ name, properties, formValues, disabled = false }
           name={name}
           disabled={disabled}
           label={properties.title}
-          descriptionText={properties.description}
+          descriptionText={
+            properties.description ? (
+              <ReactMarkdown
+                unwrapDisallowed
+                disallowedElements={['p']}
+                className="form-field-markdown"
+              >
+                {properties.description}
+              </ReactMarkdown>
+            ) : null
+          }
         />
       )
 
@@ -114,7 +124,17 @@ const FormField: FC<Props> = ({ name, properties, formValues, disabled = false }
           name={name}
           disabled={disabled}
           label={properties.title}
-          descriptionText={properties.description}
+          descriptionText={
+            properties.description ? (
+              <ReactMarkdown
+                unwrapDisallowed
+                disallowedElements={['p']}
+                className="form-field-markdown"
+              >
+                {properties.description}
+              </ReactMarkdown>
+            ) : null
+          }
           defaultValue={properties.enum[0]}
         >
           {properties.enum.map((option: Enum) => {
diff --git a/studio/stores/authConfig/schema/AuthProviders/AuthProvidersFormValidation.tsx b/studio/stores/authConfig/schema/AuthProviders/AuthProvidersFormValidation.tsx
index 566424f834f..084c21c0fcf 100644
--- a/studio/stores/authConfig/schema/AuthProviders/AuthProvidersFormValidation.tsx
+++ b/studio/stores/authConfig/schema/AuthProviders/AuthProvidersFormValidation.tsx
@@ -1004,8 +1004,9 @@ export const PROVIDER_SAML = {
   title: 'SAML 2.0',
   properties: {
     SAML_ENABLED: {
-      title: 'Enable SAML SSO',
-      description: 'Allows the use of SAML 2.0 Single Sign-On',
+      title: 'Enable SAML 2.0 Single Sign-on',
+      description:
+        'You will need to use the [Supabase CLI](https://supabase.com/docs/guides/auth/sso/auth-sso-saml#managing-saml-20-connections) to set up SAML after enabling it',
       type: 'boolean',
     },
   },
diff --git a/studio/styles/ui.scss b/studio/styles/ui.scss
index 891b2a0bb7d..0b2473d6b72 100644
--- a/studio/styles/ui.scss
+++ b/studio/styles/ui.scss
@@ -413,3 +413,9 @@
     }
   }
 }
+
+.form-field-markdown {
+  a {
+    @apply text-brand-900 transition opacity-75 hover:opacity-100 underline;
+  }
+}
\ No newline at end of file