diff --git a/Frontend/index.html b/Frontend/index.html
index fac730a..8426c23 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -1101,6 +1101,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
           // - 上方 HTML 引用套件若有使用 jquery 內存數據程序 (ex: $(x).data() , $(x).trigger("custom event") , $.fn.custom ...)
           // - 會被清洗，有類似程序需放入 loadPack1 Function rquired 引用
           // (原 datatable.bundle.js require 會出問題，先以 cdn datatable.min.js引用)
+          require.undef('baja!');
           require(["jquery"], loadedBasePack);
         });
 
@@ -1126,8 +1127,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
             "lib/chart.js_4.1.2/chart.umd",
             "lib/dropzone/dropzone-min",
             "lib/jstree-master/jstree.min",
-              "lib/notifications/sweetalert2/sweetalert2.bundle",
-            "baja!"
+            "lib/notifications/sweetalert2/sweetalert2.bundle",
+            "baja!",
           ], loadedMasterPack);
         }
         /**
@@ -1301,11 +1302,14 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
             sessionStorage.setItem("lastPage", page);
             sessionStorage.setItem("pageAct", JSON.stringify(pageAct));
             // 讀取子頁面
+            
             $("#app").load(`_${page}.html`, loadCallback);
           });
 
           onEvent("click", "#logout", function () {
             localStorage.removeItem("JWT-Authorization");
+            sessionStorage.removeItem("pageAct");
+            sessionStorage.removeItem("lastPage");
             location.href = "/logout";
           });
 
@@ -1461,7 +1465,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
           if (lastPage) {
             let lastPageAct = {};
 
-            if (isJSON(sessionStorage.getItem("pageAct"))) {
+            if (sessionStorage.getItem("pageAct") && isJSON(sessionStorage.getItem("pageAct"))) {
               lastPageAct = JSON.parse(sessionStorage.getItem("pageAct"));
             }