diff --git a/homeserver/index.html b/homeserver/index.html
index 0a5e5d5..7e64e8c 100644
--- a/homeserver/index.html
+++ b/homeserver/index.html
@@ -7,6 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" type="text/css" href="../static/css/style.css">
+    <link rel="icon" href="./static/svg/favicon.svg">
     <script src="../static/js/hash-wasm.js"></script>
   <style>
         body {
diff --git a/privacy/index.html b/privacy/index.html
index 6bcfa90..23d0e38 100644
--- a/privacy/index.html
+++ b/privacy/index.html
@@ -79,7 +79,7 @@
     EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGES.</p>
     <br>
-    <button onclick="history.back()" style="cursor: pointer; padding: 15px 20px;margin-right: auto;color: white;text-decoration: none;background-color: var(--theme-color);border-radius: 8px;border: medium;font-size: 15px;">Take me back where I was!</button>
+    <button onclick="if (document.referrer !== "") {window.location.href = document.referrer;}else {window.location.href = "https://notes.hectabit.org/login";}" style="cursor: pointer; padding: 15px 20px;margin-right: auto;color: white;text-decoration: none;background-color: var(--theme-color);border-radius: 8px;border: medium;font-size: 15px;">Take me back where I was!</button>
     <br><br>
 </body>
 
diff --git a/static/js/homeserver.js b/static/js/homeserver.js
index fb3bbb0..3a97ecd 100644
--- a/static/js/homeserver.js
+++ b/static/js/homeserver.js
@@ -32,7 +32,12 @@ changeButton.addEventListener("click", (event) => {
                     if (response.status == 200) {
                         localStorage.setItem("homeserverURL", remote)
 
-                        window.location.href = document.referrer;
+                        if (document.referrer !== "") {
+                          window.location.href = document.referrer;
+                        }
+                        else {
+                          window.location.href = "https://notes.hectabit.org/login";
+                        }
                     }
                     else if (response.status == 404) {
                         statusBox.innerText = "Not a valid homeserver!"