diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
index c780814f87..bb5bbef1a1 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
@@ -16,7 +16,8 @@
                  reset: 'SOCIAL_AUTH_AZUREAD_OAUTH2_KEY'
              },
              SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET: {
-                 type: 'text',
+                 type: 'sensitive',
+                 hasShowInputButton: true,
                  reset: 'SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET'
              },
              SOCIAL_AUTH_AZUREAD_OAUTH2_ORGANIZATION_MAP: {
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
index 81eeec8329..9aecc2699f 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                 reset: 'SOCIAL_AUTH_GITHUB_ORG_KEY'
             },
             SOCIAL_AUTH_GITHUB_ORG_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_GITHUB_ORG_SECRET'
             },
             SOCIAL_AUTH_GITHUB_ORG_NAME: {
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
index 72af97b899..3747127132 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                 reset: 'SOCIAL_AUTH_GITHUB_TEAM_KEY'
             },
             SOCIAL_AUTH_GITHUB_TEAM_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_GITHUB_TEAM_SECRET'
             },
             SOCIAL_AUTH_GITHUB_TEAM_ID: {
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
index e95fef41b0..f8af9ea74d 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                 reset: 'SOCIAL_AUTH_GITHUB_KEY'
             },
             SOCIAL_AUTH_GITHUB_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_GITHUB_SECRET'
             }
         },
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
index 1aa8cbab30..8842570974 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                 reset: 'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY'
             },
             SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET'
             },
             SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS: {
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
index 824692ea9d..0943d21b27 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
@@ -21,7 +21,8 @@ export default ['i18n', function(i18n) {
                 reset: 'AUTH_LDAP_BIND_DN'
             },
             AUTH_LDAP_BIND_PASSWORD: {
-                type: 'password'
+                type: 'sensitive',
+                hasShowInputButton: true,
             },
             AUTH_LDAP_USER_SEARCH: {
                 type: 'textarea',
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
index cec19eb122..f8aa37b014 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
@@ -21,7 +21,8 @@ export default ['i18n', function(i18n) {
                 reset: 'RADIUS_PORT'
             },
             RADIUS_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'RADIUS_SECRET'
             }
         },
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
index 7ef0735247..698bcbc6bd 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
@@ -20,7 +20,8 @@ export default ['i18n', function(i18n) {
                 reset: 'SOCIAL_AUTH_SAML_SP_PUBLIC_CERT'
             },
             SOCIAL_AUTH_SAML_SP_PRIVATE_KEY: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_SAML_SP_PRIVATE_KEY'
             },
             SOCIAL_AUTH_SAML_ORG_INFO: {
diff --git a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
index 6fcfa0dda5..f2ed9f54e3 100644
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
@@ -30,7 +30,8 @@
                  reset: 'LOG_AGGREGATOR_USERNAME'
              },
              LOG_AGGREGATOR_PASSWORD: {
-                 type: 'text',
+                 type: 'sensitive',
+                 hasShowInputButton: true,
                  reset: 'LOG_AGGREGATOR_PASSWORD'
              },
              LOG_AGGREGATOR_LOGGERS: {