diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index e06c48d136..f5fb3daf55 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -17,12 +17,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "EditUsers",
 			"author": "DevilBro",
-			"version": "4.1.6",
+			"version": "4.1.7",
 			"description": "Allows you to locally edit Users"
 		},
 		"changeLog": {
 			"fixed": {
-				"Mentions": ""
+				"Tags in DMs List": "Fixed overflowing tags in dms turning invisible"
 			}
 		}
 	};
@@ -180,6 +180,7 @@ module.exports = (_ => {
 						bottom: 1px;
 					}
 					${BDFDB.dotCNS.dmchannel + BDFDB.dotCN.bottag} {
+						display: inline;
 						margin-left: 4px;
 					}
 					${BDFDB.dotCNS.userinfo + BDFDB.dotCN.userinfodiscriminator} {
@@ -933,12 +934,12 @@ module.exports = (_ => {
 			}
 
 			processPrivateChannel (e) {
-				if (e.instance.props.user && settings.changeInDmsList) {
+				if (e.instance.props.user && settings.changeInDmsList && changedUsers[e.instance.props.user.id]) {
 					if (!e.returnvalue) {
 						let data = changedUsers[e.instance.props.user.id];
-						if (data && (data.removeStatus || data.status || data.statusEmoji)) {
+						if (data.removeStatus || data.status || data.statusEmoji) {
 							e.instance.props.activities = [].concat(e.instance.props.activities).filter(n => n.type != BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS);
-							let activity = this.createCustomStatus(data);
+							let activity = this.createCustomStatus(changedUsers[e.instance.props.user.id]);
 							if (activity) e.instance.props.activities.unshift(activity);
 						}
 					}
diff --git a/Plugins/WriteUpperCase/WriteUpperCase.plugin.js b/Plugins/WriteUpperCase/WriteUpperCase.plugin.js
index 45ac3f446b..bff1175a2e 100644
--- a/Plugins/WriteUpperCase/WriteUpperCase.plugin.js
+++ b/Plugins/WriteUpperCase/WriteUpperCase.plugin.js
@@ -17,12 +17,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "WriteUpperCase",
 			"author": "DevilBro",
-			"version": "1.2.9",
+			"version": "1.3.0",
 			"description": "Changes the first Letter of each Sentence in Message Inputs to Uppercase"
 		},
 		"changeLog": {
-			"improved": {
-				"Settings": "You can now disable/enable it form normal/edit/upload textareas"
+			"fixed": {
+				"Mentions": "No longer acts weird with mentions"
 			}
 		}
 	};
@@ -133,7 +133,7 @@ module.exports = (_ => {
 				let type = BDFDB.LibraryModules.StringUtils.upperCaseFirstChar(e.instance.props.type || "");
 				if (e.instance.props.textValue && e.instance.state.focused && (!type || settings["change" + type] || settings["change" + type] === undefined)) {
 					let string = e.instance.props.textValue;
-					if (string.length && !/:[A-z0-9_-]+:|[\uD83C-\uDBFF\uDC00-\uDFFF]+/.test(string)) {
+					if (string.length && !/<[#@]\d+>|:[A-z0-9_-]+:|[\uD83C-\uDBFF\uDC00-\uDFFF]+/.test(string)) {
 						let newString = string, stop = false;
 						for (let space of spaces) for (let symbol of symbols) if (!stop) {
 							let reg;