diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/AddCertAuthorityModal/helpers.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/AddCertAuthorityModal/helpers.tsx
index 988c0c884e..d4d9c2509a 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/AddCertAuthorityModal/helpers.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/AddCertAuthorityModal/helpers.tsx
@@ -69,7 +69,10 @@ export const getDisplayErrMessage = (err: unknown) => {
     message = INVALID_API_TOKEN_ERROR;
   } else if (reason.includes("invalid profile GUID")) {
     message = INVALID_PROFILE_GUID_ERROR;
-  } else if (reason.includes("invalid URL")) {
+  } else if (
+    reason.includes("invalid URL") ||
+    reason.includes("no such host")
+  ) {
     message = INVALID_URL_ERROR;
   } else if (reason.includes("private key")) {
     message = PRIVATE_KEY_NOT_CONFIGURED_ERROR;
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
index 4fb92db9ff..9bfeabd13e 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
@@ -47,7 +47,7 @@ const CustomSCEPForm = ({
         config?.integrations.custom_scep_proxy ?? [],
         isEditing
       ),
-    [config?.integrations.custom_scep_proxy]
+    [config?.integrations.custom_scep_proxy, isEditing]
   );
   const [
     formValidation,
@@ -83,8 +83,8 @@ const CustomSCEPForm = ({
           error={formValidation.name?.message}
           onChange={onInputChange}
           parseTarget
-          placeholder="SCEP_WIFI"
-          helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_CUSTOM_SCEP_CHALLENGE_SCEP_WIFI)."
+          placeholder="WIFI_CERTIFICATE"
+          helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_CUSTOM_SCEP_CHALLENGE_WIFI_CERTIFICATE)."
         />
         <InputField
           label="SCEP URL"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
index 59855b02c9..48611ec4e3 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
@@ -91,9 +91,9 @@ const DigicertForm = ({
           value={name}
           onChange={onInputChange}
           error={formValidation.name?.message}
-          helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_CERT_DATA_DIGICERT_WIFI)."
+          helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_DIGICERT_DATA_WIFI_CERTIFICATE)."
           parseTarget
-          placeholder="DIGICERT_WIFI"
+          placeholder="WIFI_CERTIFICATE"
         />
         <InputField
           name="url"