diff --git a/auth/email.py b/auth/email.py
index 8acfd689..2c2f91b2 100644
--- a/auth/email.py
+++ b/auth/email.py
@@ -23,7 +23,7 @@ async def send_email(user, text):
 	token = await EmailAuthenticate.get_email_token(user)
 
 	to = "%s <%s>" % (user.username, user.email)
-	auth_url_with_token = "%s?token=%s" % (AUTH_URL, token)
+	auth_url_with_token = "%s/%s" % (AUTH_URL, token)
 	text = text % (auth_url_with_token)
 	response = requests.post(
 		MAILGUN_API_URL,
diff --git a/auth/oauth.py b/auth/oauth.py
index 531da59a..7c45ccc5 100644
--- a/auth/oauth.py
+++ b/auth/oauth.py
@@ -83,5 +83,5 @@ async def oauth_authorize(request):
 	}
 	user = Identity.identity_oauth(user_input)
 	token = await Authorize.authorize(user, device="pc")
-	redirect_uri = "%s?token=%s" % (OAUTH_CALLBACK_URL, quote_plus(token))
+	redirect_uri = "%s/%s" % (OAUTH_CALLBACK_URL, quote_plus(token))
 	return RedirectResponse(url = redirect_uri)