diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index 322ef2453c..a85d1af110 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -628,23 +628,25 @@ module.exports = (_ => {
 			}
 
 			processNowPlayingItem (e) {
-				let [children, index] = BDFDB.ReactUtils.findParent(e.instance, {name: "NowPlayingHeader"});
-				if (index > -1) for (let child of children) if (child && child.props && child.props.party) {
-					if (child.type && child.type.displayName == "NowPlayingHeader") {
-						const type = child.type;
-						child.type = (...args) => {
-							const returnValue = type(...args);
-							if (BDFDB.ObjectUtils.get(returnValue, "props.priorityUser.user.username") == returnValue.props.title) {
-								returnValue.props.title = BDFDB.ReactUtils.createElement("span", {children: returnValue.props.title});
-								this.changeUserColor(returnValue.props.title, returnValue.props.priorityUser.user.id);
-							}
-							return returnValue;
-						};
+				if (this.settings.places.activity) {
+					let [children, index] = BDFDB.ReactUtils.findParent(e.instance, {name: "NowPlayingHeader"});
+					if (index > -1) for (let child of children) if (child && child.props && child.props.party) {
+						if (child.type && child.type.displayName == "NowPlayingHeader") {
+							const type = child.type;
+							child.type = (...args) => {
+								const returnValue = type(...args);
+								if (BDFDB.ObjectUtils.get(returnValue, "props.priorityUser.user.username") == returnValue.props.title) {
+									returnValue.props.title = BDFDB.ReactUtils.createElement("span", {children: returnValue.props.title});
+									this.changeUserColor(returnValue.props.title, returnValue.props.priorityUser.user.id);
+								}
+								return returnValue;
+							};
+						}
+						child.props.party = Object.assign({}, child.props.party);
+						if (child.props.party.partiedMembers) for (let i in child.props.party.partiedMembers) if (child.props.party.partiedMembers[i]) child.props.party.partiedMembers[i] = this.getUserData(child.props.party.partiedMembers[i].id);
+						if (child.props.party.priorityMembers) for (let i in child.props.party.priorityMembers) if (child.props.party.priorityMembers[i]) child.props.party.priorityMembers[i] = Object.assign({}, child.props.party.priorityMembers[i], {user: this.getUserData(child.props.party.priorityMembers[i].user.id)});
+						if (child.props.party.voiceChannels) for (let i in child.props.party.voiceChannels) if (child.props.party.voiceChannels[i]) child.props.party.voiceChannels[i] = Object.assign({}, child.props.party.voiceChannels[i], {members: [].concat(child.props.party.voiceChannels[i].members).map(user => this.getUserData(user.id))});
 					}
-					child.props.party = Object.assign({}, child.props.party);
-					if (child.props.party.partiedMembers) for (let i in child.props.party.partiedMembers) if (child.props.party.partiedMembers[i]) child.props.party.partiedMembers[i] = this.getUserData(child.props.party.partiedMembers[i].id);
-					if (child.props.party.priorityMembers) for (let i in child.props.party.priorityMembers) if (child.props.party.priorityMembers[i]) child.props.party.priorityMembers[i] = Object.assign({}, child.props.party.priorityMembers[i], {user: this.getUserData(child.props.party.priorityMembers[i].user.id)});
-					if (child.props.party.voiceChannels) for (let i in child.props.party.voiceChannels) if (child.props.party.voiceChannels[i]) child.props.party.voiceChannels[i] = Object.assign({}, child.props.party.voiceChannels[i], {members: [].concat(child.props.party.voiceChannels[i].members).map(user => this.getUserData(user.id))});
 				}
 			}
 			
@@ -938,7 +940,7 @@ module.exports = (_ => {
 							else changeMentionName(child[i]);
 						}
 						else if (child.props && typeof child.props.children == "string" && child.props.children[0] == "@") child.props.children = "@" + data.name;
-						else if (child.props && BDFDB.ArrayUtils.is(child.props.children)) changeMentionName(child.props.children);
+						else if (child.props && child.props.children) changeMentionName(child.props.children);
 					};
 					changeMentionName(mention);
 				}
diff --git a/Plugins/RemoveNicknames/RemoveNicknames.plugin.js b/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
index f34f25b1f0..ef8d989fc9 100644
--- a/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
+++ b/Plugins/RemoveNicknames/RemoveNicknames.plugin.js
@@ -2,7 +2,7 @@
  * @name RemoveNicknames
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.4.0
+ * @version 1.4.1
  * @description Replaces Nicknames with Accountnames
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,7 +17,7 @@ module.exports = (_ => {
 		"info": {
 			"name": "RemoveNicknames",
 			"author": "DevilBro",
-			"version": "1.4.0",
+			"version": "1.4.1",
 			"description": "Replaces Nicknames with Accountnames"
 		},
 		"changeLog": {
@@ -243,7 +243,19 @@ module.exports = (_ => {
 			
 			changeMention (mention, newName) {
 				if (!mention) return;
-				mention.props.children = "@" + newName;
+				const changeMentionName = (child, name) => {
+					if (!child) return;
+					if (BDFDB.ArrayUtils.is(child)) for (let i in child) {
+						if (typeof child[i] == "string" && child[i][0] == "@") {
+							if (child[i] == "@") child[parseInt(i) + 1] = newName;
+							else child[i] = "@" + newName;
+						}
+						else changeMentionName(child[i]);
+					}
+					else if (child.props && typeof child.props.children == "string" && child.props.children[0] == "@") child.props.children = "@" + newName;
+					else if (child.props && child.props.children) changeMentionName(child.props.children);
+				};
+				changeMentionName(mention);
 			}
 
 			processChannelReply (e) {