diff --git a/app/index.html b/app/index.html
index ff240fc..daf1cff 100644
--- a/app/index.html
+++ b/app/index.html
@@ -9,15 +9,12 @@
     <link rel="stylesheet" type="text/css" href="../static/css/style.css" />
     <script type="text/javascript" src="../static/js/crypto-js.js"></script>
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>
diff --git a/error/index.html b/error/index.html
index 7e0cbfd..f80b9b7 100644
--- a/error/index.html
+++ b/error/index.html
@@ -8,15 +8,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" type="text/css" href="../static/css/style.css" />
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>
diff --git a/index.html b/index.html
index 5e6e12f..b41bec4 100644
--- a/index.html
+++ b/index.html
@@ -10,15 +10,12 @@
     <meta content="Burgernotes" property="og:title" />
     <meta content="A simple note-taking app!" property="og:description" />
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>
diff --git a/login/index.html b/login/index.html
index ad71cd0..49d6bc5 100644
--- a/login/index.html
+++ b/login/index.html
@@ -20,15 +20,12 @@
         }
     </style>
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>
diff --git a/logout/index.html b/logout/index.html
index 89e6ff6..bd4f9a1 100644
--- a/logout/index.html
+++ b/logout/index.html
@@ -6,15 +6,12 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 <head>
diff --git a/privacy/index.html b/privacy/index.html
index 205f9f1..f229740 100644
--- a/privacy/index.html
+++ b/privacy/index.html
@@ -8,15 +8,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" type="text/css" href="../static/css/style.css" />
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>
diff --git a/signup/index.html b/signup/index.html
index 2e6f63a..492834c 100644
--- a/signup/index.html
+++ b/signup/index.html
@@ -20,15 +20,12 @@
         }
     </style>
     <script>
-    if (origin !== "null") {
-        // Get the current URL
-        var currentUrl = window.location.href;
-
-        // Remove '/index.html' from the current URL
-        var newUrl = currentUrl.replace('/index.html', '');
-
-        // Redirect to the new URL
-        window.location.href = newUrl;
+    if (window.location.href.endsWith('/index.html')) {
+        if (window.location.origin !== null) {
+            var currentUrl = window.location.href;
+            var newUrl = currentUrl.replace('/index.html', '');
+            window.location.href = newUrl;
+        }
     }
     </script>
 </head>