diff --git a/components/board/BoardAccess.tsx b/components/board/BoardAccess.tsx
index 0313ffc..ebaa6f9 100644
--- a/components/board/BoardAccess.tsx
+++ b/components/board/BoardAccess.tsx
@@ -1,14 +1,16 @@
 import { Role } from "@/db/schema";
 import { fetchMembersByBoardID } from "@/lib/db/member";
 import MD5 from "crypto-js/md5";
+import dynamic from "next/dynamic";
 import Image from "next/image";
-import MemberManage from "./MemberManage";
 
 interface BoardAccessProps {
   boardId: string;
   role: Role;
 }
 
+const MemberManage = dynamic(() => import("@/components/board/MemberManage"), { ssr: false });
+
 export default async function BoardAccess({ boardId, role }: BoardAccessProps) {
   const members = await fetchMembersByBoardID(boardId);
   const memberCount = members.length;
@@ -38,7 +40,7 @@ export default async function BoardAccess({ boardId, role }: BoardAccessProps) {
           </div>
         )}
       </div>
-      {role === Role.owner && <MemberManage boardId={boardId} />}
+      {role === Role.owner && <MemberManage boardId={boardId} members={members} />}
     </div>
   );
 }
diff --git a/components/board/MemberList.tsx b/components/board/MemberList.tsx
index 222ad15..30aad9a 100644
--- a/components/board/MemberList.tsx
+++ b/components/board/MemberList.tsx
@@ -1,30 +1,21 @@
 "use client";
 
-import React, { useState } from "react";
 import { removeMemberFromBoard } from "@/lib/actions/boardActions";
-import type { Role } from "@/db/schema";
-
-interface Member {
-  id: number;
-  userId: string;
-  role: Role;
-  updateAt: Date;
-}
+import React from "react";
+import type { MemberInfo } from "./MemberManage";
 
 interface MemberListProps {
   boardId: string;
-  initialMembers: Member[];
+  members: MemberInfo[];
 }
 
 export default function MemberList({
   boardId,
-  initialMembers,
+  members,
 }: MemberListProps) {
-  const [members, setMembers] = useState(initialMembers);
 
   async function handleRemoveMember(memberId: number) {
     await removeMemberFromBoard(boardId, memberId);
-    setMembers(members.filter((member) => member.id !== memberId));
   }
 
   return (
@@ -35,7 +26,7 @@ export default function MemberList({
           className="flex justify-between items-center bg-gray-100 p-2 rounded"
         >
           <div>
-            <p className="font-semibold">{member.userId}</p>
+            <p className="font-semibold">{member.username}</p>
           </div>
           <button
             onClick={() => handleRemoveMember(member.id)}
diff --git a/components/board/MemberManage.tsx b/components/board/MemberManage.tsx
index 861afef..99825d5 100644
--- a/components/board/MemberManage.tsx
+++ b/components/board/MemberManage.tsx
@@ -1,61 +1,73 @@
 "use client";
 
-import React, { useState } from "react";
+import type { Role } from "@/db/schema";
 import { addMemberToBoard } from "@/lib/actions/boardActions";
+import React, { useState } from "react";
+import MemberList from "./MemberList";
 
 interface MemberManageProps {
   boardId: string;
+  members: MemberInfo[];
+}
+
+export interface MemberInfo {
+  id: number;
+  userId: string;
+  role: Role;
+  username: string;
+  email: string;
+  updateAt: Date;
 }
 
-export default function MemberManage({ boardId }: MemberManageProps) {
+export default function MemberManage({ boardId, members }: MemberManageProps) {
   const [email, setEmail] = useState("");
-  const [isModalOpen, setIsModalOpen] = useState(false);
 
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
     if (email.trim()) {
       await addMemberToBoard(boardId, email.trim());
       setEmail("");
-      setIsModalOpen(false);
     }
   }
 
   return (
     <>
       <button
-        onClick={() => setIsModalOpen(true)}
-        className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
+        className="btn mx-4"
+        onClick={() => {
+          const modal = document.getElementById(
+            "member_manage_modal"
+          ) as HTMLDialogElement;
+          if (modal) {
+            modal.showModal();
+          }
+        }}
       >
         Manage Members
       </button>
-      {isModalOpen && (
-        <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center">
-          <div className="bg-white p-4 rounded">
-            <form onSubmit={handleSubmit} className="mb-4">
-              <input
-                type="email"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-                placeholder="Enter email address"
-                className="w-full p-2 border rounded"
-                required
-              />
-              <button
-                type="submit"
-                className="mt-2 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
-              >
-                Add Member
-              </button>
-            </form>
-            <button
-              onClick={() => setIsModalOpen(false)}
-              className="px-4 py-2 bg-gray-300 text-black rounded hover:bg-gray-400"
-            >
-              Close
+      <dialog id="member_manage_modal" className="modal">
+        <div className="modal-box">
+          <form onSubmit={handleSubmit} className="flex">
+            <input
+              type="email"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+              placeholder="Enter email address"
+              className="w-full p-2 mr-0.5 border rounded"
+              required
+            />
+            <button type="submit" className="mt-2 btn btn-primary">
+              Add Member
             </button>
+          </form>
+          <div className="m-2">
+            <MemberList boardId={boardId} members={members} />
           </div>
         </div>
-      )}
+        <form method="dialog" className="modal-backdrop">
+          <button></button>
+        </form>
+      </dialog>
     </>
   );
 }