diff --git a/changelog.md b/changelog.md
index 4b67c17..2044f17 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,4 @@
-## version 0.8.1 -> 0.8.5
+## version 0.8.1 -> 0.8.6
  - Added new automatic Docker mapping feature (for people not using (sub)domains)
  - Added guardrails to prevent Let's Encrypt from failing to initialize when adding wrong domains
  - App store image size issue
@@ -8,6 +8,7 @@
  - Fixed issue where home page was https:// links on http only servers
  - Improved setup flow for setting up hostname and HTTPS
  - Fixed auto-update on ARM based CPU
+ - Fix issue with email links
 
 ## Version 0.8.0
  - Custmizable homepage / theme colors
diff --git a/package.json b/package.json
index b7cbc7b..bf40688 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/user/password_reset.go b/src/user/password_reset.go
index 94e6952..602c701 100644
--- a/src/user/password_reset.go
+++ b/src/user/password_reset.go
@@ -76,7 +76,7 @@ func ResetPassword(w http.ResponseWriter, req *http.Request) {
 			}
 
 			utils.Debug("Sending an email to " + user.Email)
-			url := utils.GetServerURL() + ("ui/register?t=1&nickname="+user.Nickname+"&key=" + RegisterKey)
+			url := utils.GetServerURL() + ("cosmos-ui/register?t=1&nickname="+user.Nickname+"&key=" + RegisterKey)
 			
 			errEm := SendPasswordEmail(user.Nickname, user.Email, url) 
 
diff --git a/src/user/resend.go b/src/user/resend.go
index 8d5e23e..17e020a 100644
--- a/src/user/resend.go
+++ b/src/user/resend.go
@@ -79,7 +79,7 @@ func UserResendInviteLink(w http.ResponseWriter, req *http.Request) {
 
 			if utils.IsEmailEnabled() && user.Email != "" {
 				utils.Debug("Sending an email to " + user.Email)
-				url := utils.GetServerURL() + ("ui/register?t="+request.FormType+"&nickname="+user.Nickname+"&key=" + RegisterKey)
+				url := utils.GetServerURL() + ("cosmos-ui/register?t="+request.FormType+"&nickname="+user.Nickname+"&key=" + RegisterKey)
 				
 				var errEm error