diff --git a/src/Billing/BillingSettings.cs b/src/Billing/BillingSettings.cs
index eea4f9b934..32630e4a4a 100644
--- a/src/Billing/BillingSettings.cs
+++ b/src/Billing/BillingSettings.cs
@@ -36,7 +36,8 @@ public class BillingSettings
         public virtual string OrgFieldName { get; set; }
 
         public virtual bool RemoveNewlinesInReplies { get; set; } = false;
-        public virtual string AutoReplyFooter { get; set; } = string.Empty;
+        public virtual string AutoReplyGreeting { get; set; } = string.Empty;
+        public virtual string AutoReplySalutation { get; set; } = string.Empty;
     }
 
     public class OnyxSettings
diff --git a/src/Billing/Controllers/FreshdeskController.cs b/src/Billing/Controllers/FreshdeskController.cs
index 7ddf54a6d3..5c6ca9450f 100644
--- a/src/Billing/Controllers/FreshdeskController.cs
+++ b/src/Billing/Controllers/FreshdeskController.cs
@@ -194,7 +194,7 @@ public class FreshdeskController : Controller
         // eventually, we will merge both endpoints into one webhook for Freshdesk
 
         // ensure that the key is from Freshdesk
-        if (!IsValidRequestFromFreshdesk(key))
+        if (!IsValidRequestFromFreshdesk(key) || !ModelState.IsValid)
         {
             return new BadRequestResult();
         }
@@ -305,7 +305,7 @@ public class FreshdeskController : Controller
 
         var replyBody = new FreshdeskReplyRequestModel
         {
-            Body = $"{note}{_billingSettings.FreshDesk.AutoReplyFooter}",
+            Body = $"{_billingSettings.FreshDesk.AutoReplyGreeting}{note}{_billingSettings.FreshDesk.AutoReplySalutation}",
         };
 
         var replyRequest = new HttpRequestMessage(HttpMethod.Post,
diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json
index 76db204ac6..8b982dbe49 100644
--- a/src/Billing/appsettings.json
+++ b/src/Billing/appsettings.json
@@ -74,7 +74,8 @@
       "userFieldName": "cf_user",
       "orgFieldName": "cf_org",
       "removeNewlinesInReplies": true,
-      "autoReplyFooter": "<br /><small><i>2024 Bitwarden</i></small>"
+      "autoReplyGreeting": "Greetings,<br />",
+      "autoReplySalutation": "<br /><p>Regards,<br />CS Team</p>"
     },
     "onyx": {
       "apiKey": "on_tenant_i-16a83ec44869babc4.aDffNn2k4UvtRt_9KdlV_3lfjiLFdOe4mdAiE3jJb4thWUGURVETwFg1Xrtg5rwLvfqfcw_F6U0V87arVkARd7qHQxmL5vaC4k8gPxh3hTKJKEE7Rkc3BJHOSAiT-leINjWvj44hpIuTRcWazz_zafZi-_D6123wplCb3PG6UtiGlyxcK8FJCZKp9IEM4UTTYXUHc7nWUVZuhiREGPd5J7T8LIWoenfkSJ1Vhi2PoLDI6msMOLfSGuLT_Ma_pJZl",