diff --git a/src/pages/members/agent-balance/AgentBalance.tsx b/src/pages/members/agent-balance/AgentBalance.tsx
index 2bdc376..4a1282b 100644
--- a/src/pages/members/agent-balance/AgentBalance.tsx
+++ b/src/pages/members/agent-balance/AgentBalance.tsx
@@ -244,7 +244,7 @@ const PaymentCard = ({ barcode, agent_name, customerId, token_legacy, setToken_l
 
   const updateTokenLegacy = async () => {
     try {
-      if (!token_legacy) toast.warning(`Token Legacy can not be empty`);
+      if (!token_legacy) return toast.warning(`Token Legacy can not be empty`);
       await axios.post(`${BASE_URL}/token/insert-token-legacy`, {
         customerid: customerId,
         token_legacy
diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx
index 04bd81d..41ebe5e 100644
--- a/src/pages/members/manage-members/blocks/DetailMember.tsx
+++ b/src/pages/members/manage-members/blocks/DetailMember.tsx
@@ -174,13 +174,13 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
         if (dialogType === 'update') {
             // if (page === 'kyc' && formData.destinationGroup === "Premium" && !formData.approval_description_premium) return toast.warning(`Approval Premium Description needed!`)
             // if (page === 'kyc' && formData.destinationGroup === "Agent" && !formData.approval_description_premium) return toast.warning(`Approval Agent Description needed!`)
-            if (!formData.msisdn||!formData.email||!formData.fullname||!formData.username||!formData.mother_fullname||!formData.address||!formData.nationality||!formData.date_birth||!formData.gender) {
-                return toast.warning(`Required fields cannot be empty: msisdn, email, fullname, username, mother Full Name, Address, Nationality, Date Of Birth, Gender.!`)
+            if (!formData.msisdn||!formData.email||!formData.fullname||!formData.username||!formData.address||!formData.nationality||!formData.date_birth||!formData.gender) {
+                return toast.warning(`Required fields cannot be empty: msisdn, email, fullname, username, Address, Nationality, Date Of Birth, Gender.!`)
             }
         }
         if (dialogType === 'create') {
-            if (!formData.msisdn||!formData.email||!formData.fullname||!formData.username||!formData.mother_fullname||!formData.address||!formData.nationality||!formData.date_birth||!formData.gender) {
-                return toast.warning(`Required fields cannot be empty: msisdn, email, fullname, username, mother Full Name, Address, Nationality, Date Of Birth, Gender.!`)
+            if (!formData.msisdn||!formData.email||!formData.fullname||!formData.username||!formData.address||!formData.nationality||!formData.date_birth||!formData.gender) {
+                return toast.warning(`Required fields cannot be empty: msisdn, email, fullname, username, Address, Nationality, Date Of Birth, Gender.!`)
             }
         }
         // if (page === 'kyc' && !formData.description) return toast.warning(`Description for approval needed!`)