diff --git a/app/articles/server/api/api.js b/app/articles/server/api/api.js
index 40a01fc22c55..634378c80a75 100644
--- a/app/articles/server/api/api.js
+++ b/app/articles/server/api/api.js
@@ -29,10 +29,11 @@ const Api = new Restivus({
 				}
 			}
 
-            this.announceToken  = settings.get('Announcement_Token');
-
-			if (this.announceToken !== decodeURIComponent(this.request.params.token)) {
+			this.announceToken = settings.get('Announcement_Token');
+			const { blogId } = this.request.params;
+			const token = decodeURIComponent(this.request.params.token);
 
+			if (this.announceToken !== `${ blogId }/${ token }`) {
 				return {
 					error: {
 						statusCode: 404,
@@ -54,8 +55,6 @@ const Api = new Restivus({
 });
 
 function executeAnnouncementRest() {
-
-
 	const defaultValues = {
 		channel: this.bodyParams.channel,
 		alias: this.bodyParams.alias,
@@ -87,4 +86,4 @@ function executeAnnouncementRest() {
 Api.addRoute(':blogId/:token', { authRequired: true }, {
 	post: executeAnnouncementRest,
 	get: executeAnnouncementRest,
-});
\ No newline at end of file
+});
diff --git a/app/articles/server/methods/admin.js b/app/articles/server/methods/admin.js
index 800143f0d15f..660a87efe019 100644
--- a/app/articles/server/methods/admin.js
+++ b/app/articles/server/methods/admin.js
@@ -18,10 +18,10 @@ function setupGhost(user, token) {
 	const rcUrl = Meteor.absoluteUrl().replace(/\/$/, '');
 	const blogTitle = settings.get('Article_Site_title');
 	const blogToken = Random.id(17);
-	const announceToken = `${blogToken}/${Random.id(24)}`;
-	const collabToken = `${blogToken}/${Random.id(24)}`;
-	settings.updateById('Announcement_Token', announce_token);
-	settings.updateById('Collaboration_Token', announce_token);
+	const announceToken = `${ blogToken }/${ Random.id(24) }`;
+	const collabToken = `${ blogToken }/${ Random.id(24) }`;
+	settings.updateById('Announcement_Token', announceToken);
+	settings.updateById('Collaboration_Token', collabToken);
 	const data = {
 		setup: [{
 			rc_url: rcUrl,
diff --git a/app/articles/server/settings.js b/app/articles/server/settings.js
index ff4724e6cf23..62f6e2080335 100644
--- a/app/articles/server/settings.js
+++ b/app/articles/server/settings.js
@@ -34,6 +34,7 @@ Meteor.startup(() => {
 
 		this.add('Announcement_Token', 'announcement_token', {
 			type: 'string',
+			readonly: true,
 			enableQuery: {
 				_id: 'Articles_enabled',
 				value: true,
@@ -43,6 +44,7 @@ Meteor.startup(() => {
 
 		this.add('Collaboration_Token', 'collaboration_token', {
 			type: 'string',
+			readonly: true,
 			enableQuery: {
 				_id: 'Articles_enabled',
 				value: true,