diff --git a/changelog/infra-form-updates.yaml b/changelog/infra-form-updates.yaml
new file mode 100644
index 00000000000..1a545761aa4
--- /dev/null
+++ b/changelog/infra-form-updates.yaml
@@ -0,0 +1,4 @@
+type: Changed # One of: Added, Changed, Developer Experience, Deprecated, Docs, Fixed, Removed, Security
+description: Updated infrastructure monitor form to not show classification options, use a password input for the key, and use consistent wording.
+pr: 7240 # PR number
+labels: [] # Optional: ["high-risk", "db-migration"]
diff --git a/clients/admin-ui/src/features/common/form/FormFieldFromSchema.tsx b/clients/admin-ui/src/features/common/form/FormFieldFromSchema.tsx
index 6b442fcb795..6135079b89c 100644
--- a/clients/admin-ui/src/features/common/form/FormFieldFromSchema.tsx
+++ b/clients/admin-ui/src/features/common/form/FormFieldFromSchema.tsx
@@ -91,7 +91,8 @@ export const FormFieldFromSchema = ({
           );
         }
 
-        if (fieldSchema.multiline) {
+        // Use textarea for multiline fields, but prioritize password input for sensitive fields
+        if (fieldSchema.multiline && !fieldSchema.sensitive) {
           return (
             <CustomTextArea
               {...field}
diff --git a/clients/admin-ui/src/features/integrations/configure-monitor/ConfigureMonitorForm.tsx b/clients/admin-ui/src/features/integrations/configure-monitor/ConfigureMonitorForm.tsx
index ec08f93ff9c..e1dec95d857 100644
--- a/clients/admin-ui/src/features/integrations/configure-monitor/ConfigureMonitorForm.tsx
+++ b/clients/admin-ui/src/features/integrations/configure-monitor/ConfigureMonitorForm.tsx
@@ -9,6 +9,10 @@ import { useEffect, useState } from "react";
 import { useFeatures } from "~/features/common/features/features.slice";
 import { enumToOptions } from "~/features/common/helpers";
 import { useGetConfigurationSettingsQuery } from "~/features/config-settings/config-settings.slice";
+import {
+  getMonitorType,
+  MONITOR_TYPES,
+} from "~/features/data-discovery-and-detection/action-center/utils/getMonitorType";
 import { useGetSystemByFidesKeyQuery } from "~/features/system";
 import { useGetAllUsersQuery } from "~/features/user-management";
 import {
@@ -104,6 +108,16 @@ const ConfigureMonitorForm = ({
    */
   const llmClassifierFeatureEnabled = !!flags.heliosV2;
 
+  const isInfrastructureMonitor =
+    getMonitorType(integrationOption.identifier as ConnectionType) ===
+    MONITOR_TYPES.INFRASTRUCTURE;
+
+  /**
+   * Show the LLM classifier option if the feature is enabled and the monitor is not an infrastructure monitor.
+   * Infrastructure monitors (e.g., Okta) don't use classification.
+   */
+  const showLLMOption = llmClassifierFeatureEnabled && !isInfrastructureMonitor;
+
   const { data: appConfig } = useGetConfigurationSettingsQuery(
     {
       api_set: false,
@@ -282,7 +296,7 @@ const ConfigureMonitorForm = ({
           showTime
         />
       </Form.Item>
-      {llmClassifierFeatureEnabled && (
+      {showLLMOption && (
         <>
           <Form.Item
             name="use_llm_classifier"
diff --git a/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx b/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx
index 6cd57c12e31..2bbd153c683 100644
--- a/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx
+++ b/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx
@@ -25,7 +25,7 @@ const DATA_DISCOVERY_MONITOR_COPY = `A data discovery monitor observes configure
 
 const WEBSITE_MONITOR_COPY = `Configure your website monitor to identify active ad tech vendors and tracking technologies across your site. This monitor will analyze selected pages for vendor activity, compliance with privacy requirements, and data collection practices. Set your preferences below to customize the monitor frequency and scan locations.`;
 
-const OKTA_MONITOR_COPY = `Configure your SSO provider monitor to detect and map systems within your infrastructure. This monitor will analyze connected systems to identify their activity and ensure accurate representation in your data map. Set your preferences below to customize the monitor&apos;s scan frequency and scope. To learn more about monitors, view our docs here.`;
+const OKTA_MONITOR_COPY = `Configure your identity provider monitor to detect and map systems within your infrastructure. This monitor will analyze connected systems to identify their activity and ensure accurate representation in your data map. Set your preferences below to customize the monitor's scan frequency and scope. To learn more about monitors, view our docs here.`;
 
 const MONITOR_COPIES: Partial<Record<ConnectionType, string>> = {
   [ConnectionType.WEBSITE]: WEBSITE_MONITOR_COPY,
diff --git a/clients/admin-ui/src/features/integrations/integration-type-info/oktaInfo.tsx b/clients/admin-ui/src/features/integrations/integration-type-info/oktaInfo.tsx
index 9fb89a26062..892c51022be 100644
--- a/clients/admin-ui/src/features/integrations/integration-type-info/oktaInfo.tsx
+++ b/clients/admin-ui/src/features/integrations/integration-type-info/oktaInfo.tsx
@@ -14,10 +14,10 @@ export const OKTA_INTEGRATION_PLACEHOLDER = {
 
 export const OKTA_DESCRIPTION = (
   <>
-    SSO providers manage user authentication and can help identify systems
-    within your infrastructure. Adding an SSO provider as a data source allows
-    you to detect connected systems, monitor access patterns, and enhance your
-    data map for better visibility and control.
+    Identity providers manage user authentication and can help identify systems
+    within your infrastructure. Adding an identity provider as a data source
+    allows you to detect connected systems, monitor access patterns, and enhance
+    your data map for better visibility and control.
   </>
 );