diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index ad4fa118e4..2f496315de 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -550,11 +550,6 @@ module.exports = (_ => {
 							guildId = BDFDB.LibraryStores.SelectedGuildStore.getGuildId();
 							tagClass = BDFDB.disCNS.userpopoutheaderbottag + BDFDB.disCN.bottagnametag;
 						}
-						else if (e.instance.props.className.indexOf(BDFDB.disCN.userpopoutusernametagnonickname) > -1) {
-							change = this.settings.places.userPopout;
-							guildId = BDFDB.LibraryStores.SelectedGuildStore.getGuildId();
-							tagClass = BDFDB.disCNS.userpopoutusernamebottag + BDFDB.disCN.bottagnametag;
-						}
 						else if (e.instance.props.className.indexOf(BDFDB.disCN.guildsettingsinviteusername) > -1) {
 							change = this.settings.places.guildSettings;
 						}
@@ -658,7 +653,7 @@ module.exports = (_ => {
 					}
 					else {
 						if (data.color1 || data.tag) {
-							let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutusernamenickname]]});
+							let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadernickname]]});
 							if (index > -1) {
 								this.changeUserColor(children[index], e.instance.props.user.id);
 								if (!BDFDB.ArrayUtils.is(children[index].props.children)) children[index].props.children = [children[index].props.children].flat(10);
diff --git a/Plugins/StaffTag/StaffTag.plugin.js b/Plugins/StaffTag/StaffTag.plugin.js
index 782398cc53..710d8fd8d4 100644
--- a/Plugins/StaffTag/StaffTag.plugin.js
+++ b/Plugins/StaffTag/StaffTag.plugin.js
@@ -2,7 +2,7 @@
  * @name StaffTag
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.5.8
+ * @version 1.5.9
  * @description Adds a Crown/Tag to Server Owners (or Admins/Management)
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -305,10 +305,6 @@ module.exports = (_ => {
 							inject = this.settings.tagPlaces.userPopout;
 							tagClass = BDFDB.disCNS.userpopoutheaderbottag + BDFDB.disCN.bottagnametag;
 						}
-						else if (e.instance.props.className.indexOf(BDFDB.disCN.userpopoutusernametagnonickname) > -1) {
-							inject = this.settings.tagPlaces.userPopout;
-							tagClass = BDFDB.disCNS.userpopoutusernamebottag + BDFDB.disCN.bottagnametag;
-						}
 						else if (e.instance.props.className.indexOf(BDFDB.disCN.userprofilenametag) > -1) {
 							inject = this.settings.tagPlaces.userProfile;
 							tagClass = BDFDB.disCNS.userprofilebottag + BDFDB.disCN.bottagnametag;
@@ -326,7 +322,7 @@ module.exports = (_ => {
 				if (e.instance.props.user && this.settings.tagPlaces.userPopout) {
 					let userType = this.getUserType(e.instance.props.user, e.instance.props.channel && e.instance.props.channel.id);
 					if (userType) {
-						let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutusernamenickname]]});
+						let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutheadernickname]]});
 						if (index > -1) {
 							if (!BDFDB.ArrayUtils.is(children[index].props.children)) children[index].props.children = [children[index].props.children].flat(10);
 							this.injectStaffTag(children[index].props.children, e.instance.props.user, userType, 2, {