diff --git a/functions/src/payments/phonepe/webhook.ts b/functions/src/payments/phonepe/webhook.ts
index 2ba5136..bf09946 100644
--- a/functions/src/payments/phonepe/webhook.ts
+++ b/functions/src/payments/phonepe/webhook.ts
@@ -172,6 +172,7 @@ export const phonePeWebhook = onRequest({
                   let paymentType = orderData.metaInfo?.paymentType || 'Gym Membership';
                   let trainerId = orderData.metaInfo?.trainerId;
                   let trainerData = null;
+                  let emailCustomer = membershipData?.fields?.['email'] || membershipData?.fields?.['Email Address'];
 
                   const discountPercentage = orderData.metaInfo?.discount || 0;
                   const hasDiscount = discountPercentage > 0;
@@ -242,9 +243,9 @@ export const phonePeWebhook = onRequest({
                     businessName: gymName,
                     address: gymAddress,
                     gstNumber: userData?.gstNumber,
-                    customerName: userData?.displayName || `${membershipData?.fields?.['first-name'] || ''} ${membershipData?.fields?.['last-name'] || ''}`.trim(),
-                    phoneNumber: membershipData?.fields?.['phone-number'] || orderData.metaInfo?.phoneNumber || '',
-                    email: membershipData?.fields?.['email'] || '',
+                    customerName: userData?.displayName || `${membershipData?.fields?.['first-name'] || ''} ${membershipData?.fields?.['last-name'] || ''}`.trim() || membershipData?.fields?.['First Name'] || '',
+                    phoneNumber: membershipData?.fields?.['phone-number'] || membershipData?.fields?.['Phone Number'] || orderData.metaInfo?.phoneNumber || '',
+                    email: membershipData?.fields?.['email'] || membershipData?.fields?.['Email Address'] || '',
                     planName: orderData.metaInfo?.planName || subscriptionName,
                     amount: orderData.amount,
                     transactionId: payload.orderId,
@@ -308,7 +309,7 @@ export const phonePeWebhook = onRequest({
 
                   const formattedDate = format(new Date(), 'dd/MM/yyyy');
 
-                  if (membershipData?.fields?.['email']) {
+                  if (emailCustomer) {
                     logger.info(`Preparing to send invoice email to customer: ${membershipData?.fields?.['email']}`);
                     try {
                       const emailSubject = isFreeplan
@@ -342,7 +343,7 @@ export const phonePeWebhook = onRequest({
                       `;
 
                       await sendEmailWithAttachmentUtil(
-                        membershipData?.fields?.['email'],
+                        emailCustomer,
                         emailSubject,
                         customerEmailHtml,
                         downloadUrl,