diff --git a/src/flags.js b/src/flags.js
index a453dccf03..c0c49c4a0a 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -497,7 +497,7 @@ Flags.update = function (flagId, uid, changeset, callback) {
 	var tasks = [];
 	var now = changeset.datetime || Date.now();
 	var notifyAssignee = function (assigneeId, next) {
-		if (assigneeId === '') {
+		if (assigneeId === '' || parseInt(uid, 10) === parseInt(assigneeId, 10)) {
 			// Do nothing
 			return next();
 		}
@@ -689,7 +689,7 @@ Flags.notify = function (flagObj, uid, callback) {
 				bodyShort: '[[notifications:user_flagged_post_in, ' + flagObj.reporter.username + ', ' + titleEscaped + ']]',
 				bodyLong: flagObj.description,
 				pid: flagObj.targetId,
-				path: '/post/' + flagObj.targetId,
+				path: '/flags/' + flagObj.flagId,
 				nid: 'flag:post:' + flagObj.targetId + ':uid:' + uid,
 				from: uid,
 				mergeId: 'notifications:user_flagged_post_in|' + flagObj.targetId,
@@ -726,7 +726,7 @@ Flags.notify = function (flagObj, uid, callback) {
 				type: 'new-user-flag',
 				bodyShort: '[[notifications:user_flagged_user, ' + flagObj.reporter.username + ', ' + flagObj.target.username + ']]',
 				bodyLong: flagObj.description,
-				path: '/uid/' + flagObj.targetId,
+				path: '/flags/' + flagObj.flagId,
 				nid: 'flag:user:' + flagObj.targetId + ':uid:' + uid,
 				from: uid,
 				mergeId: 'notifications:user_flagged_user|' + flagObj.targetId,