diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index 30dc99687..8b140c0ca 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -144,7 +144,7 @@ function createFeedbackStore() {
                     message,
                     email,
                     customFields,
-                    firstname: name || 'Unknown',
+                    firstname: (name || 'Unknown').slice(0, 40),
                     metaFields: {
                         source: get(feedback).source,
                         orgId,
diff --git a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
index bcaef823b..a6835a9c0 100644
--- a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
@@ -64,7 +64,7 @@
             body: JSON.stringify({
                 subject: 'BAA Request',
                 email: email,
-                firstName: $user?.name ?? '',
+                firstName: ($user?.name ?? '').slice(0, 40),
                 message: `BAA request for ${$organization?.name ?? ''} (${$organization?.$id ?? ''})`,
                 tags: ['cloud'],
                 customFields: [
diff --git a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
index 1ec321e23..bce0634a3 100644
--- a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
@@ -65,7 +65,7 @@
             body: JSON.stringify({
                 subject: 'SOC-2 Request',
                 email: email,
-                firstName: $user?.name ?? '',
+                firstName: ($user?.name ?? '').slice(0, 40),
                 message: `SOC-2 request for ${$organization?.name ?? ''} (${$organization?.$id ?? ''})`,
                 tags: ['cloud'],
                 customFields: [
diff --git a/src/routes/(console)/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte
index a3531d06e..6c6aa7045 100644
--- a/src/routes/(console)/supportWizard.svelte
+++ b/src/routes/(console)/supportWizard.svelte
@@ -49,7 +49,7 @@
             body: JSON.stringify({
                 email: $user.email,
                 subject: $supportData.subject,
-                firstName: $user?.name || 'Unknown',
+                firstName: ($user?.name || 'Unknown').slice(0, 40),
                 message: $supportData.message,
                 tags: ['cloud'],
                 customFields: [