diff --git a/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx b/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx
index d0e5c591f..820eb3e9e 100644
--- a/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx
+++ b/client/src/components/bill-ai-feedback/bill-ai-feedback.component.jsx
@@ -4,8 +4,15 @@ import axios from "axios";
 import { useState } from "react";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { createStructuredSelector } from "reselect";
 
-function BillAiFeedback({ billForm, rawAIData }) {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+function BillAiFeedback({ billForm, rawAIData, bodyshop }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [submitting, setSubmitting] = useState(false);
@@ -53,6 +60,7 @@ function BillAiFeedback({ billForm, rawAIData }) {
       formData.append("comments", comments || "");
       formData.append("billFormValues", sanitizeBillFormValues(billFormValues));
       formData.append("rawAIData", sanitizeBillFormValues(rawAIData));
+      formData.append("shopname", bodyshop?.shopname || "");
 
       const attachmentFile = getAttachmentFromBillFormUpload();
       if (attachmentFile) {
@@ -107,4 +115,4 @@ function BillAiFeedback({ billForm, rawAIData }) {
     </Form>
   );
 }
-export default BillAiFeedback;
+export default connect(mapStateToProps, null)(BillAiFeedback);
diff --git a/server/ai/bill-ai-feedback.js b/server/ai/bill-ai-feedback.js
index e136c60f4..25f969771 100644
--- a/server/ai/bill-ai-feedback.js
+++ b/server/ai/bill-ai-feedback.js
@@ -24,7 +24,8 @@ const handleBillAiFeedback = async (req, res) => {
         const rawAIData = safeJsonParse(req.body?.rawAIData);
 
         const jobid = billFormValues?.jobid || billFormValues?.jobId || "unknown";
-        const subject = `Bill AI Feedback (${rating === "up" ? "+" : "-"}) jobid=${jobid}`;
+        const shopname = req.body?.shopname || "unknown";
+        const subject = `Bill AI Feedback (${rating === "up" ? "+" : "-"}) Shop=${shopname} jobid=${jobid}`;
 
         const text = [
             `User: ${req?.user?.email || "unknown"}`,