diff --git a/src/notifications.js b/src/notifications.js
index 8d984f11c3..86feff02b4 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -55,6 +55,11 @@ var async = require('async'),
 						}
 						notification.image = userData.picture || null;
 						notification.user = userData;
+
+						if (userData.username === '[[global:guest]]') {
+							notification.bodyShort = notification.bodyShort.replace(/([\s\S]*?),[\s\S]*?,([\s\S]*?)/, '$1, [[global:guest]], $2');
+						}
+						
 						next(null, notification);
 					});
 					return;