diff --git a/src/components/CreateCompany/CreateCompany.tsx b/src/components/CreateCompany/CreateCompany.tsx
index 48923b9..0b9a0c1 100644
--- a/src/components/CreateCompany/CreateCompany.tsx
+++ b/src/components/CreateCompany/CreateCompany.tsx
@@ -46,7 +46,7 @@ const CreateCompany: React.FC<Props> = ({
         async (data) => {
           try {
             let haveError = false
-            if (companyCodes.includes(data.companyCode)) {
+            if (companyCodes.includes(data.companyCode.toLowerCase().trim())) {
                 haveError = true
                 formProps.setError("companyCode", { message: t("Duplicated Code."), type: "required" })
             }
@@ -57,8 +57,8 @@ const CreateCompany: React.FC<Props> = ({
             console.log("passed")
             setServerError("");
             // console.log(JSON.stringify(data));
-            // await saveCompany(data)
-            // router.replace("/settings/company");
+            await saveCompany(data)
+            router.replace("/settings/company");
           } catch (e) {
             setServerError(t("An error has occurred. Please try again later."));
           }
diff --git a/src/components/CreateCompany/CreateCompanyWrapper.tsx b/src/components/CreateCompany/CreateCompanyWrapper.tsx
index 10e7905..6fc3243 100644
--- a/src/components/CreateCompany/CreateCompanyWrapper.tsx
+++ b/src/components/CreateCompany/CreateCompanyWrapper.tsx
@@ -1,7 +1,7 @@
 import { fetchCompanyDetails, fetchCompanys } from "@/app/api/companys";
 import CreateCompany from "./CreateCompany";
 
-type CreateCompanyProps = {isEdit: false}
+type CreateCompanyProps = { isEdit: false }
 interface EditCompanyProps {
     isEdit: true;
     companyId?: string;
@@ -14,12 +14,12 @@ const CreateCompanyWrapper: React.FC<Props> = async (props) => {
     // console.log(props)
 
     const companyDetails = props.isEdit
-  ? await fetchCompanyDetails(props.companyId!)
-  : undefined;
-    const [ company ] = await Promise.all([fetchCompanys()])
+        ? await fetchCompanyDetails(props.companyId!)
+        : undefined;
+    const [company] = await Promise.all([fetchCompanys()])
     console.log(company)
     return (
-        <CreateCompany companyCodes={company.map(c => c.companyCode)} isEdit company={companyDetails}
+        <CreateCompany companyCodes={Boolean(companyDetails) ? company.map(c => c.companyCode.toLowerCase().trim()).filter(ele => ele !== companyDetails?.companyCode.toLowerCase().trim()) : company.map(c => c.companyCode.toLowerCase().trim())} isEdit company={companyDetails}
         />
     )
 }
diff --git a/src/components/CreateDepartment/CreateDepartment.tsx b/src/components/CreateDepartment/CreateDepartment.tsx
index 9586ecc..9016d58 100644
--- a/src/components/CreateDepartment/CreateDepartment.tsx
+++ b/src/components/CreateDepartment/CreateDepartment.tsx
@@ -51,7 +51,7 @@ const CreateDepartment: React.FC<Props> = ({
       try {
         console.log(data);
         let haveError = false
-        if (depCodes.includes(data.code)) {
+        if (depCodes.includes(data.code.toLowerCase().trim())) {
           formProps.setError("code", { message: t("Duplicated code."), type: "required" })
           haveError = true
         }
diff --git a/src/components/CreateDepartment/CreateDepartmentWrapper.tsx b/src/components/CreateDepartment/CreateDepartmentWrapper.tsx
index fbfc889..e412ed4 100644
--- a/src/components/CreateDepartment/CreateDepartmentWrapper.tsx
+++ b/src/components/CreateDepartment/CreateDepartmentWrapper.tsx
@@ -20,7 +20,7 @@ const CreateDepartmentWrapper: React.FC<Props> = async (props) => {
   const [ department ] = await Promise.all([fetchDepartments()])
 
   return (
-    <CreateDepartment depCodes={department.map(d => d.code)} isEdit department={departmentInfo}
+    <CreateDepartment depCodes={Boolean(departmentInfo) ? department.map(d => d.code.toLowerCase().trim()).filter(code => code !== departmentInfo?.code.toLowerCase().trim()) : department.map(d => d.code.toLowerCase().trim())} isEdit department={departmentInfo}
     />
   );
 };
diff --git a/src/components/CreateSkill/CreateSkill.tsx b/src/components/CreateSkill/CreateSkill.tsx
index 3924498..207f9ea 100644
--- a/src/components/CreateSkill/CreateSkill.tsx
+++ b/src/components/CreateSkill/CreateSkill.tsx
@@ -25,6 +25,7 @@ const CreateSkill: React.FC<Props> = ({
   skill
 }) => {
   const codeList = skill.map(s => s.code.toLowerCase().trim())
+  console.log(codeList)
   const formProps = useForm<CreateSkillInputs>();
   const [serverError, setServerError] = useState("");
   const router = useRouter();
diff --git a/src/components/EditSkill/EditSkill.tsx b/src/components/EditSkill/EditSkill.tsx
index 19c323c..a2a2703 100644
--- a/src/components/EditSkill/EditSkill.tsx
+++ b/src/components/EditSkill/EditSkill.tsx
@@ -30,12 +30,14 @@ import AuthAllocation from "../EditUser/AuthAllocation";
 
 interface Props {
   skills: SkillResult[];
+  skillList: SkillResult[];
 }
 
 const EditSkill: React.FC<Props> = async ({ 
-  skills
+  skills,
+  skillList
 }) => {
-  const codeList = skills.map(s => s.code.toLowerCase().trim())
+  const codeList = skillList.map(s => s.code.toLowerCase().trim()).filter(code => code !== skills[0].code.toLowerCase().trim())
   const { t } = useTranslation();
   const formProps = useForm<CreateSkillInputs>();
   const [serverError, setServerError] = useState("");
@@ -106,6 +108,7 @@ const EditSkill: React.FC<Props> = async ({
   }, []);
   
   useEffect(() => {
+    console.log(skills)
     resetSkill()
   }, [skills]);
 
diff --git a/src/components/EditSkill/EditSkillWrapper.tsx b/src/components/EditSkill/EditSkillWrapper.tsx
index dabb621..1122a73 100644
--- a/src/components/EditSkill/EditSkillWrapper.tsx
+++ b/src/components/EditSkill/EditSkillWrapper.tsx
@@ -15,8 +15,9 @@ interface Props {
 
 const EditSkillWrapper: React.FC<Props> & SubComponents = async ({ id }) => {
     const skills = await fetchSkillDetail(id)
+    const skillList = await fetchSkill()
 
-  return <EditSkill skills={skills}/>;
+  return <EditSkill skills={skills} skillList={skillList}/>;
 };
 
 EditSkillWrapper.Loading = EditSkillLoading;
diff --git a/src/components/EditTeam/EditTeam.tsx b/src/components/EditTeam/EditTeam.tsx
index 71a334a..77dae8b 100644
--- a/src/components/EditTeam/EditTeam.tsx
+++ b/src/components/EditTeam/EditTeam.tsx
@@ -95,6 +95,8 @@ const EditTeam: React.FC<Props> = async ({ staff, teamInfo }) => {
           description: data.description,
           addStaffIds: data.addStaffIds,
           deleteStaffIds: data.deleteStaffIds,
+          code: data.code,
+          name: data.name,
           id: parseInt(idString!!),
         } as  CreateTeamInputs
         console.log(tempData);