diff --git a/messages/en-US.json b/messages/en-US.json
index 68572da4..f75d95c6 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1743,6 +1743,7 @@
     "orgAuthNoIdpConfigured": "This organization doesn't have any identity providers configured. You can log in with your Pangolin identity instead.",
     "orgAuthSignInWithPangolin": "Sign in with Pangolin",
     "subscriptionRequiredToUse": "A subscription is required to use this feature.",
+    "licenseRequiredToUse": "An Enterprise license is required to use this feature.",
     "idpDisabled": "Identity providers are disabled.",
     "orgAuthPageDisabled": "Organization auth page is disabled.",
     "domainRestartedDescription": "Domain verification restarted successfully",
diff --git a/src/app/[orgId]/settings/general/page.tsx b/src/app/[orgId]/settings/general/page.tsx
index 1d2508f0..45d3c397 100644
--- a/src/app/[orgId]/settings/general/page.tsx
+++ b/src/app/[orgId]/settings/general/page.tsx
@@ -53,6 +53,7 @@ import { SwitchInput } from "@app/components/SwitchInput";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
 import { Badge } from "@app/components/ui/badge";
+import { Alert, AlertDescription } from "@app/components/ui/alert";
 
 // Session length options in hours
 const SESSION_LENGTH_OPTIONS = [
@@ -338,23 +339,30 @@ export default function GeneralPage() {
             {/* Security Settings Section */}
             <SettingsSection>
                 <SettingsSectionHeader>
-                    <div className="flex items-center gap-2">
-                        <SettingsSectionTitle>
-                            {t("securitySettings")}
-                        </SettingsSectionTitle>
-                        {build === "enterprise" && !isUnlocked() ? (
-                            <Badge variant="outlinePrimary">
-                                {build === "enterprise"
-                                    ? t("licenseBadge")
-                                    : t("subscriptionBadge")}
-                            </Badge>
-                        ) : null}
-                    </div>
+                    <SettingsSectionTitle>
+                        {t("securitySettings")}
+                    </SettingsSectionTitle>
                     <SettingsSectionDescription>
                         {t("securitySettingsDescription")}
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
                 <SettingsSectionBody>
+                    {build == "saas" && !subscriptionStatus?.isSubscribed() ? (
+                        <Alert variant="info" className="mb-6">
+                            <AlertDescription>
+                                {t("subscriptionRequiredToUse")}
+                            </AlertDescription>
+                        </Alert>
+                    ) : null}
+
+                    {build == "enterprise" && !isUnlocked() ? (
+                        <Alert variant="info" className="mb-6">
+                            <AlertDescription>
+                                {t("licenseRequiredToUse")}
+                            </AlertDescription>
+                        </Alert>
+                    ) : null}
+
                     <SettingsSectionForm>
                         <Form {...form}>
                             <form