diff --git a/src/pages/groups/ManageGroups.tsx b/src/pages/groups/ManageGroups.tsx
index 7704ad1..55ae1eb 100644
--- a/src/pages/groups/ManageGroups.tsx
+++ b/src/pages/groups/ManageGroups.tsx
@@ -89,6 +89,10 @@ const ManageGroups = () => {
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
+    if (!formData.groupName) return toast.warning(`Group name can not be empty!`)
+    if (!formData.status) return toast.warning(`Status can not be empty!`)
+    if (!formData.description) return toast.warning(`Description can not be empty!`)
+    setIsDialogOpen(false);
     setDialogOpen(true);
   };
 
@@ -198,7 +202,7 @@ const ManageGroups = () => {
       <Dialog open={isDialogOpen} onClose={closeDialog}>
         <DialogContent className="w-full">
           <div className="flex justify-between">
-            <DialogTitle>Create New Group</DialogTitle>
+            <DialogTitle>{dialogType==='create'?"Create New Group":"Update Group"}</DialogTitle>
             <Box display="flex" justifyContent="flex-end">
               <Button
                 variant="outlined"
diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx
index 8749113..85035ad 100644
--- a/src/pages/members/manage-members/blocks/DetailMember.tsx
+++ b/src/pages/members/manage-members/blocks/DetailMember.tsx
@@ -200,7 +200,7 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
         <Dialog open={showAddDialog} onOpenChange={(open) => handleAddDialog(open)}>
             <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5">
                 <DialogHeader>
-                    <DialogTitle>Member - View/Edit</DialogTitle>
+                    <DialogTitle>Member - {dialogType ==='create' ? "Create" : "View/Edit"}</DialogTitle>
                     <DialogDescription></DialogDescription>
                 </DialogHeader>
                 <DialogBody ref={parentRef}>