From 3a090ef3088565307a31af625b1c8a1c86f198e8 Mon Sep 17 00:00:00 2001
From: Fokke Zandbergen <mail@fokkezb.nl>
Date: Wed, 15 Apr 2015 13:18:06 +0200
Subject: [PATCH 1/3] Fix link in email notifications

---
 src/topics/follow.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/topics/follow.js b/src/topics/follow.js
index c34e15fd96..07e1fd815d 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -154,6 +154,7 @@ module.exports = function(Topics) {
 								postBody: postData.content,
 								site_title: meta.config.title || 'NodeBB',
 								username: data.userData.username,
+								userslug: data.userData.userslug,
 								url: nconf.get('url') + '/topic/' + postData.topic.tid,
 								base_url: nconf.get('url')
 							}, next);
@@ -166,4 +167,4 @@ module.exports = function(Topics) {
 			}
 		], callback);
 	};
-};
\ No newline at end of file
+};

From a17cbbb8ad9a5237e2fe8751f89b3f03b22e7736 Mon Sep 17 00:00:00 2001
From: Fokke Zandbergen <mail@fokkezb.nl>
Date: Wed, 15 Apr 2015 13:18:50 +0200
Subject: [PATCH 2/3] Fix link in email notifications

---
 src/views/emails/notif_post_plaintext.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/emails/notif_post_plaintext.tpl b/src/views/emails/notif_post_plaintext.tpl
index 0920b2f79e..0a317466a8 100644
--- a/src/views/emails/notif_post_plaintext.tpl
+++ b/src/views/emails/notif_post_plaintext.tpl
@@ -11,4 +11,4 @@
 
 ===
 
-[[email:notif.post.unsub.info]] <a href="{base_url}/user/{username}/settings">[[email:unsub.cta]]</a>.
\ No newline at end of file
+[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.

From 49e996caafaf0229a5ad1c61d0887cb9f65cd3e3 Mon Sep 17 00:00:00 2001
From: Fokke Zandbergen <mail@fokkezb.nl>
Date: Wed, 15 Apr 2015 13:19:00 +0200
Subject: [PATCH 3/3] Fix link in email notifications

---
 src/views/emails/notif_post.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl
index 1f91d044be..78ac8fefb0 100644
--- a/src/views/emails/notif_post.tpl
+++ b/src/views/emails/notif_post.tpl
@@ -12,5 +12,5 @@
 
 <hr />
 <p>
-	[[email:notif.post.unsub.info]] <a href="{base_url}/user/{username}/settings">[[email:unsub.cta]]</a>.
-</p>
\ No newline at end of file
+	[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
+</p>