diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index 08b3bea560..faa6ec9700 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -65,13 +65,30 @@ define('notifications', ['sounds', 'translator', 'components'], function(sound,
 		}
 
 		socket.on('event:new_notification', function(notifData) {
-			app.alert({
-				alert_id: 'new_notif',
-				title: '[[notifications:new_notification]]',
-				message: '[[notifications:you_have_unread_notifications]]',
-				type: 'warning',
-				timeout: 2000
-			});
+			// If a path is defined, show notif data, otherwise show generic data
+			var payload;
+			if (notifData.path) {
+				payload = {
+					alert_id: 'new_notif',
+					title: '[[notifications:new_notification]]',
+					message: notifData.bodyShort,
+					type: 'info',
+					timeout: 2000,
+					clickfn: function() {
+						ajaxify.go(notifData.path);
+					}
+				};
+			} else {
+				payload = {
+					alert_id: 'new_notif',
+					title: '[[notifications:new_notification]]',
+					message: '[[notifications:you_have_unread_notifications]]',
+					type: 'warning',
+					timeout: 2000
+				};
+			}
+
+			app.alert(payload);
 			app.refreshTitle();
 
 			if (ajaxify.currentPage === 'notifications') {
diff --git a/src/notifications.js b/src/notifications.js
index 2b6e7e4733..f0e72ceb97 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -195,9 +195,12 @@ var async = require('async'),
 
 			var websockets = require('./socket.io');
 			if (websockets.server) {
-				for(var i=0; i<uids.length; ++i) {
-					websockets.in('uid_' + uids[i]).emit('event:new_notification', notification);
-				}
+				// Add notification paths to sent notification object as well
+				async.eachLimit(uids, 50, function(uid, next) {
+					User.notifications.generateNotificationPaths([notification], uid, function(err, notifications) {
+						websockets.in('uid_' + uid).emit('event:new_notification', notifications[0]);
+					});
+				});
 			}
 
 			callback();