diff --git a/greenmine/base/users/templates/emails/password_recovery-body-html.jinja b/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
index f083e168..4c8b6696 100644
--- a/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
+++ b/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
@@ -1 +1 @@
-Password recovery token: {{ user.token }}
+Password recovery token: {{ resolve_front_url('change-password', user.token) }}
diff --git a/greenmine/front/__init__.py b/greenmine/front/__init__.py
index 2da15e9b..b0032380 100644
--- a/greenmine/front/__init__.py
+++ b/greenmine/front/__init__.py
@@ -9,6 +9,7 @@ URLS = {
     "userstory": "/#/project/{0}/user-story/{1}",
     "task": "/#/project/{0}/tasks/{1}",
     "issue": "/#/project/{0}/issues/{1}",
+    "change-password": "/#/change-password/{0}",
 }
 
 
@@ -21,10 +22,10 @@ def get_current_site():
 
 
 @lib.global_function(name="resolve_front_url")
-def resolve(type, projectId, itemId):
+def resolve(type, *args):
     site = get_current_site()
     url_tmpl = "{scheme}//{domain}{url}"
 
     scheme = site.scheme and "{0}:".format(site.scheme) or ""
-    url = URLS[type].format(projectId, itemId)
+    url = URLS[type].format(*args)
     return url_tmpl.format(scheme=scheme, domain=site.domain, url=url)