diff --git a/src/_screens/criteria/criteria-setting/index.js b/src/_screens/criteria/criteria-setting/index.js
index 5371987..ad41dfd 100644
--- a/src/_screens/criteria/criteria-setting/index.js
+++ b/src/_screens/criteria/criteria-setting/index.js
@@ -93,7 +93,7 @@ export default function CriteriaSetting() {
     const saveCriteriaSetting = async () => {
       try {
         const dataSave = {
-          school_list: schoolList,
+          school_list: schoolList || [authentication?.user?.organization_id],
           assign_number_active: criteriaTarget.assign.enable ? 1 : 0,
           assign_number_target_1: criteriaTarget.assign.target1,
           assign_number_target_2: criteriaTarget.assign.target2,
@@ -124,9 +124,9 @@ export default function CriteriaSetting() {
         return await apiCaller(
           "/report/api_report/removeCriteriaFromOrganization",
           "PUT",
-          { school_list: schoolList }
+          { school_list: schoolList || [authentication?.user?.organization_id] }
         );
-      } else {
+      } else {     
         return await apiCaller(
           "/report/api_report/assignCriteriaToOrganization",
           "PUT",
@@ -244,7 +244,6 @@ export default function CriteriaSetting() {
                 },
               })
             }
-            disabled={onlyRead()}
           />
         </div>
         <div style={{ width: "100%" }}>
diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js
index 8fda505..ee1e03f 100644
--- a/src/_screens/home/admin/index.js
+++ b/src/_screens/home/admin/index.js
@@ -94,13 +94,15 @@ export default function AdminHome() {
       const res = await apiCaller(endPoint, "GET");
       setIsLoading(false);
       if (res?.status) {
-        history.push(
-          replacePathParams(PATH.home.detailTeacher, {
-            teacherId: res?.data?.[0]?.teacher_id,
-          }) +
-            "?teacher_name=" +
-            encodeURIComponent(res?.data?.[0]?.teacher_name),
-        );
+        const teacherId = res?.data?.[0]?.teacher_id;
+        const teacherName = encodeURIComponent(res?.data?.[0]?.teacher_name);
+        const detailPath = replacePathParams(PATH.home.detailTeacher, { teacherId});
+        
+        history.push({
+          pathname: detailPath,
+          search: `?teacher_name=${teacherName}`,
+          state: { isBack: true }
+        });
       }
     } catch (err) {
       setIsLoading(false);