diff --git a/src/client-scopes/add/components/ScriptComponent.tsx b/src/client-scopes/add/components/ScriptComponent.tsx
index 2b2547cb46..f152ab1353 100644
--- a/src/client-scopes/add/components/ScriptComponent.tsx
+++ b/src/client-scopes/add/components/ScriptComponent.tsx
@@ -20,7 +20,11 @@ export const ScriptComponent = ({
     <FormGroup
       label={t(label!)}
       labelIcon={
-        <HelpItem helpText={t(helpText!)} forLabel={t(label!)} forID={name!} />
+        <HelpItem
+          helpText={<span style={{ whiteSpace: "pre-wrap" }}>{helpText}</span>}
+          forLabel={t(label!)}
+          forID={name!}
+        />
       }
       fieldId={name!}
     >
diff --git a/src/client-scopes/messages.ts b/src/client-scopes/messages.ts
index 354d12e77d..c8ff0dc4ba 100644
--- a/src/client-scopes/messages.ts
+++ b/src/client-scopes/messages.ts
@@ -199,5 +199,13 @@ export default {
         },
       },
     },
+    "name-id-format": "Name ID Format",
+    mapper: {
+      nameid: {
+        format: {
+          tooltip: "Name ID Format using Mapper",
+        },
+      },
+    },
   },
 };