diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index 52e93ab19..4e28b7738 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -95,7 +95,12 @@ export function EmailOverlayContainer({
     setRawHtml(response.data);
     form.setFieldsValue({
       ...emailConfig.messageOptions,
-
+      cc:
+        emailConfig.messageOptions.cc &&
+        emailConfig.messageOptions.cc.filter((x) => x),
+      to:
+        emailConfig.messageOptions.to &&
+        emailConfig.messageOptions.to.filter((x) => x),
       html: response.data,
       fileList: [],
     });
diff --git a/client/src/components/payment-form/payment-form.component.jsx b/client/src/components/payment-form/payment-form.component.jsx
index 037b6bc13..c384898fe 100644
--- a/client/src/components/payment-form/payment-form.component.jsx
+++ b/client/src/components/payment-form/payment-form.component.jsx
@@ -143,8 +143,8 @@ export function PaymentFormComponent({
         initialValue="email"
       >
         <Radio.Group disabled={disabled}>
-          <Radio.Button value="email">{t("general.labels.email")}</Radio.Button>
-          <Radio.Button value="print">{t("general.labels.print")}</Radio.Button>
+          <Radio value="email">{t("general.labels.email")}</Radio>
+          <Radio value="print">{t("general.labels.print")}</Radio>
         </Radio.Group>
       </Form.Item>