diff --git a/main.go b/main.go
index 3b09f93..f4e8b98 100644
--- a/main.go
+++ b/main.go
@@ -392,7 +392,7 @@ func main() {
 
 		datatemplate := jwt.MapClaims{
 			"sub":       username,
-			"iss":       "https://goauth.hectabit.org",
+			"iss":       "https://auth.hectabit.org",
 			"name":      username,
 			"aud":       appId,
 			"exp":       time.Now().Unix() + 2592000,
diff --git a/static/js/dashboard.js b/static/js/dashboard.js
index 35e2fec..ac9013c 100644
--- a/static/js/dashboard.js
+++ b/static/js/dashboard.js
@@ -5,8 +5,8 @@ if (localStorage.getItem("DONOTSHARE-secretkey") === null) {
 }
 let remote = localStorage.getItem("homeserverURL")
 if (remote == null) {
-    localStorage.setItem("homeserverURL", "https://goauth.hectabit.org")
-    remote = "https://goauth.hectabit.org"
+    localStorage.setItem("homeserverURL", "https://auth.hectabit.org")
+    remote = "https://auth.hectabit.org"
 }
 
 
diff --git a/static/js/login.js b/static/js/login.js
index fad8410..11a1e5f 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -11,8 +11,8 @@ if (localStorage.getItem("DONOTSHARE-password") !== null) {
 
 let remote = localStorage.getItem("homeserverURL")
 if (remote == null) {
-    localStorage.setItem("homeserverURL", "https://goauth.hectabit.org")
-    remote = "https://goauth.hectabit.org"
+    localStorage.setItem("homeserverURL", "https://auth.hectabit.org")
+    remote = "https://auth.hectabit.org"
 }
 
 let usernameBox = document.getElementById("usernameBox")
diff --git a/static/js/signup.js b/static/js/signup.js
index f564ce6..89f98f3 100644
--- a/static/js/signup.js
+++ b/static/js/signup.js
@@ -11,8 +11,8 @@ if (localStorage.getItem("DONOTSHARE-password") !== null) {
 
 let remote = localStorage.getItem("homeserverURL")
 if (remote == null) {
-    localStorage.setItem("homeserverURL", "https://goauth.hectabit.org")
-    remote = "https://goauth.hectabit.org"
+    localStorage.setItem("homeserverURL", "https://auth.hectabit.org")
+    remote = "https://auth.hectabit.org"
 }
 
 let usernameBox = document.getElementById("usernameBox")
diff --git a/templates/openid.html b/templates/openid.html
index f60e7d0..cee0452 100644
--- a/templates/openid.html
+++ b/templates/openid.html
@@ -1,8 +1,8 @@
 {
-  "issuer": "https://goauth.hectabit.org",
-  "authorization_endpoint": "https://goauth.hectabit.org/login",
-  "token_endpoint": "https://goauth.hectabit.org/api/tokenauth",
-  "userinfo_endpoint": "https://goauth.hectabit.org/userinfo",
+  "issuer": "https://auth.hectabit.org",
+  "authorization_endpoint": "https://auth.hectabit.org/login",
+  "token_endpoint": "https://auth.hectabit.org/api/tokenauth",
+  "userinfo_endpoint": "https://auth.hectabit.org/userinfo",
   "response_types_supported": ["code"],
   "subject_types_supported": ["public"]
 }