diff --git a/static/js/login.js b/static/js/login.js
index 53f9238..622b210 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -71,6 +71,10 @@ function showElements(yesorno) {
     }
 }
 
+document.addEventListener('DOMContentLoaded', function() {
+    document.getElementById("homeserver").innerText = "Your homeserver is: " + origin + ". "
+});
+
 signupButton.addEventListener("click", (event) => {
     if (passwordBox.classList.contains("hidden")) {
         if (usernameBox.value == "") {
diff --git a/static/js/signup.js b/static/js/signup.js
index 5c983c8..b15e238 100644
--- a/static/js/signup.js
+++ b/static/js/signup.js
@@ -33,6 +33,10 @@ function showElements(yesorno) {
     }
 }
 
+document.addEventListener('DOMContentLoaded', function() {
+    document.getElementById("homeserver").innerText = "Your homeserver is: " + origin + ". "
+});
+
 signupButton.addEventListener("click", (event) => {
     async function doStuff() {
         let username = usernameBox.value
diff --git a/templates/login.html b/templates/login.html
index 284e97f..cd39362 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -33,7 +33,7 @@
         <br>
         <br>
         <p>Don't have an account? If so, <a href="../signup/index.html">Create one here!</a></p>
-        <div style="display: flex;"><p id="homeserver">Your homeserver is: https://hectabit.org. </p><div style="display: flex;flex-direction: column;justify-content: center;"><a href="/">Change</a></div></div>
+        <div style="display: flex;"><p id="homeserver">Your homeserver is loading... </p><div style="display: flex;flex-direction: column;justify-content: center;"><a href="/homeserver">Change</a></div></div>
         <a href="../privacy/index.html">Privacy &amp; Terms</a>
     </div>
 
diff --git a/templates/signup.html b/templates/signup.html
index fd91996..9394e33 100644
--- a/templates/signup.html
+++ b/templates/signup.html
@@ -31,7 +31,7 @@
         <button id="signupButton">Signup</button><br><br>
         <p>Already have an account? If so, <a href="../login/index.html">Login</a> instead!</p>
         <p>Please note that it's impossible to reset your password, do not forget it!</p>
-        <div style="display: flex;"><p id="homeserver">Your homeserver is: https://hectabit.org. </p><div style="display: flex;flex-direction: column;justify-content: center;"><a href="/">Change</a></div></div>
+        <div style="display: flex;"><p id="homeserver">Your homeserver is loading... </p><div style="display: flex;flex-direction: column;justify-content: center;"><a href="/homeserver">Change</a></div></div>
         <a href="../privacy/index.html">Privacy &amp; Terms</a>
     </div>
     <script type="text/javascript" src="../static/js/signup.js"></script>