diff --git a/frontend/Web/index.html b/frontend/Web/index.html
index b3abc37..f398f7a 100644
--- a/frontend/Web/index.html
+++ b/frontend/Web/index.html
@@ -133,7 +133,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
diff --git a/frontend/Web/login.html b/frontend/Web/login.html
index b2cfe36..cecc75f 100644
--- a/frontend/Web/login.html
+++ b/frontend/Web/login.html
@@ -171,7 +171,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
diff --git a/frontend/Web/passwd.html b/frontend/Web/passwd.html
index ada0800..848e864 100644
--- a/frontend/Web/passwd.html
+++ b/frontend/Web/passwd.html
@@ -172,7 +172,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
@@ -240,6 +239,12 @@
     }
     document.addEventListener('SessionReady', async () => {
       await UpdateUserInfo();
+      if((await GetMyPrivilege())<1)
+      {
+        document.querySelector('.passwd-box').style.display = 'none';
+        document.querySelector('.content').innerHTML = '<div class="info-box"><h2>Please log in first.</h2><p>Redirecting to home page in 3 seconds...</p></div>';
+        setTimeout(function(){window.location.href="/";},3000);
+      }
     });
     async function TryPasswd()
     {
@@ -260,14 +265,6 @@
         setTimeout(function(){window.location.href="/";},3000);
       }
     }
-    (async () => {
-      if((await GetMyPrivilege())<1)
-      {
-        document.querySelector('.passwd-box').style.display = 'none';
-        document.querySelector('.content').innerHTML = '<div class="info-box"><h2>Please log in first.</h2><p>Redirecting to home page in 3 seconds...</p></div>';
-        setTimeout(function(){window.location.href="/";},3000);
-      }
-    })();
   </script>
   <script src="/sessioninit.js"></script>
 </body>
diff --git a/frontend/Web/register.html b/frontend/Web/register.html
index 7d19af4..43831a5 100644
--- a/frontend/Web/register.html
+++ b/frontend/Web/register.html
@@ -172,7 +172,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>