diff --git a/src/messaging.js b/src/messaging.js
index 052f13fbdd..3affeedf19 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -402,6 +402,7 @@ var db = require('./database'),
 				emailer.send('notif_chat', touid, {
 					subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]',
 					username: messageObj.toUser.username,
+					userslug: utils.slugify(messageObj.toUser.username),
 					summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
 					message: messageObj,
 					site_title: meta.config.title || 'NodeBB',
diff --git a/src/user/digest.js b/src/user/digest.js
index 97b408b910..d1e9be76e0 100644
--- a/src/user/digest.js
+++ b/src/user/digest.js
@@ -75,7 +75,7 @@ var	async = require('async'),
 	Digest.send = function(data, callback) {
 		var	now = new Date();
 
-		user.getMultipleUserFields(data.subscribers, ['uid', 'username', 'lastonline'], function(err, users) {
+		user.getMultipleUserFields(data.subscribers, ['uid', 'username', 'userslug', 'lastonline'], function(err, users) {
 			if (err) {
 				winston.error('[user/jobs] Could not send digests (' + data.interval + '): ' + err.message);
 				return callback(err);
@@ -104,6 +104,7 @@ var	async = require('async'),
 					emailer.send('digest', userObj.uid, {
 						subject: '[' + meta.config.title + '] Digest for ' + now.getFullYear()+ '/' + (now.getMonth()+1) + '/' + now.getDate(),
 						username: userObj.username,
+						userslug: userObj.userslug,
 						url: nconf.get('url'),
 						site_title: meta.config.title || meta.config.browserTitle || 'NodeBB',
 						notifications: notifications,
diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tpl
index aca42a05e0..e763b53755 100644
--- a/src/views/emails/digest.tpl
+++ b/src/views/emails/digest.tpl
@@ -40,5 +40,5 @@
 
 <hr />
 <p>
-	[[email:digest.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
+	[[email:digest.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
 </p>
\ No newline at end of file
diff --git a/src/views/emails/digest_plaintext.tpl b/src/views/emails/digest_plaintext.tpl
index eb539eb59a..25e44bac68 100644
--- a/src/views/emails/digest_plaintext.tpl
+++ b/src/views/emails/digest_plaintext.tpl
@@ -28,4 +28,4 @@
 
 ===
 
-[[email:digest.unsub.info]] [[email:unsub.cta]]: {url}/user/{username}/settings.
\ No newline at end of file
+[[email:digest.unsub.info]] [[email:unsub.cta]]: {url}/user/{userslug}/settings.
\ No newline at end of file
diff --git a/src/views/emails/notif_chat.tpl b/src/views/emails/notif_chat.tpl
index a7e6be420d..da7d1611d3 100644
--- a/src/views/emails/notif_chat.tpl
+++ b/src/views/emails/notif_chat.tpl
@@ -12,5 +12,5 @@
 
 <hr />
 <p>
-	[[email:notif.chat.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
+	[[email:notif.chat.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
 </p>
\ No newline at end of file
diff --git a/src/views/emails/notif_chat_plaintext.tpl b/src/views/emails/notif_chat_plaintext.tpl
index 3ecc1f82fc..d548b5643f 100644
--- a/src/views/emails/notif_chat_plaintext.tpl
+++ b/src/views/emails/notif_chat_plaintext.tpl
@@ -12,4 +12,4 @@
 
 ===
 
-[[email:notif.chat.unsub.info]] <a href="{url}/user/{username}/settings">[[email:unsub.cta]]</a>.
+[[email:notif.chat.unsub.info]] <a href="{url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.