diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
index 2d4120b903..2b7a8910e5 100644
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@@ -25,7 +25,7 @@ define(['sounds'], function(sound) {
 							image = '';
 						}
 
-						return '<li class="' + (notification.readClass || '') + '"><a href="' + notification.path + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(notification.datetime, true) + '</span><span class="text">' + notification.text + '</span></a></li>';
+						return '<li class="' + (notification.readClass || '') + '"><a href="' + (notification.path || '#') + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(notification.datetime, true) + '</span><span class="text">' + notification.text + '</span></a></li>';
 					}
 
 					var	x, html = '';
diff --git a/src/notifications.js b/src/notifications.js
index 9bb92eb4ce..4652af0c61 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -83,7 +83,7 @@ var async = require('async'),
 		// Add default values to data Object if not already set
 		var	defaults = {
 				text: '',
-				path: null,
+				path: '',
 				importance: 5,
 				datetime: Date.now(),
 				uniqueId: utils.generateUUID()
diff --git a/src/user/create.js b/src/user/create.js
index 95bd7c154a..f9efeebaef 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -154,7 +154,7 @@ module.exports = function(User) {
 					if (userNameChanged) {
 						notifications.create({
 							text: '[[user:username_taken_workaround, ' + userData.username + ']]',
-							picture: 'brand:logo',
+							image: 'brand:logo',
 							datetime: Date.now()
 						}, function(nid) {
 							notifications.push(nid, uid);