diff --git a/public/templates/admin/facebook.tpl b/public/templates/admin/facebook.tpl
index aa9b61610e..92118c573e 100644
--- a/public/templates/admin/facebook.tpl
+++ b/public/templates/admin/facebook.tpl
@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>
\ No newline at end of file
diff --git a/public/templates/admin/gplus.tpl b/public/templates/admin/gplus.tpl
index 11b6794608..c1a691b99f 100644
--- a/public/templates/admin/gplus.tpl
+++ b/public/templates/admin/gplus.tpl
@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>
\ No newline at end of file
diff --git a/public/templates/admin/motd.tpl b/public/templates/admin/motd.tpl
index 5ff96271cc..17f6bce16e 100644
--- a/public/templates/admin/motd.tpl
+++ b/public/templates/admin/motd.tpl
@@ -24,5 +24,10 @@
 <button class="btn btn-lg btn-primary" id="save" checked>Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>
\ No newline at end of file
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index c5d85ad578..c048730ca1 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -75,5 +75,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>
\ No newline at end of file
diff --git a/public/templates/admin/twitter.tpl b/public/templates/admin/twitter.tpl
index f84849a3eb..77876e066b 100644
--- a/public/templates/admin/twitter.tpl
+++ b/public/templates/admin/twitter.tpl
@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>
diff --git a/src/user.js b/src/user.js
index ce03af3527..a0190567f1 100644
--- a/src/user.js
+++ b/src/user.js
@@ -590,7 +590,7 @@ var utils = require('./../public/src/utils.js'),
 				topics.getTopicField(tid, 'slug', function(err, slug) {
 					var message = '<strong>' + username + '</strong> made a new post';
 
-					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'notification_'+ Date.now(), function(nid) {
+					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'topic:'+ tid, function(nid) {
 		 				notifications.push(nid, followers);
 					});
 				});