diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index ef9ab2772..d954cdcc3 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -139,7 +139,9 @@ export function EmailOverlayComponent({
       </Form.Item>
 
       <Divider>{t("emails.labels.preview")}</Divider>
-      <strong>{t("emails.labels.pdfcopywillbeattached")}</strong>
+      {bodyshop.attach_pdf_to_email && (
+        <strong>{t("emails.labels.pdfcopywillbeattached")}</strong>
+      )}
 
       <Form.Item shouldUpdate>
         {() => {
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 2caa4556e..e9bc47f8f 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -80,8 +80,30 @@ export default async function RenderTemplate(
     } else {
       let pdf;
       if (bodyshop.attach_pdf_to_email) {
-        const pdfRequest = _.cloneDeep(reportRequest);
-        pdfRequest.template.recipe = "chrome-pdf";
+        const pdfRequest = _.cloneDeep(reportRequest); //Updates to spread in the header details.
+        pdfRequest.template = {
+          ...pdfRequest.template,
+          ...{
+            recipe: "chrome-pdf",
+            ...(!ignoreCustomMargins && {
+              chrome: {
+                marginTop:
+                  bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.headerMargin &&
+                  bodyshop.logo_img_path.headerMargin > 36
+                    ? bodyshop.logo_img_path.headerMargin
+                    : "36px",
+                marginBottom:
+                  bodyshop.logo_img_path &&
+                  bodyshop.logo_img_path.footerMargin &&
+                  bodyshop.logo_img_path.footerMargin > 50
+                    ? bodyshop.logo_img_path.footerMargin
+                    : "50px",
+              },
+            }),
+          },
+        };
+        console.log("PDFREQ", pdfRequest);
         const pdfRender = await jsreport.renderAsync(pdfRequest);
         pdf = pdfRender.toDataURI();
       }