diff --git a/src/equicordplugins/moreUserTags/consts.ts b/src/equicordplugins/expandedUserTags/consts.ts
similarity index 89%
rename from src/equicordplugins/moreUserTags/consts.ts
rename to src/equicordplugins/expandedUserTags/consts.ts
index 14ea3dd9..8d820637 100644
--- a/src/equicordplugins/moreUserTags/consts.ts
+++ b/src/equicordplugins/expandedUserTags/consts.ts
@@ -9,9 +9,14 @@ import { GuildStore } from "@webpack/common";
 import { RC } from "@webpack/types";
 import { Channel, Guild, Message, User } from "discord-types/general";
 
+import { settings } from "./settings";
 import type { ITag } from "./types";
 
-export const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
+export const isWebhook = (message: Message, user: User) => {
+    const isFollowed = message?.type === 0 && !!message?.messageReference && !settings.store.showWebhookTagFully;
+    return !!message?.webhookId && user.isNonUserBot() && !isFollowed;
+};
+
 export const tags = [
     {
         name: "WEBHOOK",
diff --git a/src/equicordplugins/moreUserTags/index.tsx b/src/equicordplugins/expandedUserTags/index.tsx
similarity index 94%
rename from src/equicordplugins/moreUserTags/index.tsx
rename to src/equicordplugins/expandedUserTags/index.tsx
index b37f597f..3948b4a1 100644
--- a/src/equicordplugins/moreUserTags/index.tsx
+++ b/src/equicordplugins/expandedUserTags/index.tsx
@@ -76,7 +76,7 @@ export default definePlugin({
     renderNicknameIcon(props) {
         const tagId = this.getTag({
             user: UserStore.getUser(props.userId),
-            channel: ChannelStore.getChannel(this.getChannelId()),
+            channel: getCurrentChannel(),
             channelId: this.getChannelId(),
             isChat: false
         });
@@ -92,7 +92,7 @@ export default definePlugin({
             message: props.message,
             user: UserStore.getUser(props.message.author.id),
             channelId: props.message.channel_id,
-            isChat: false
+            isChat: true
         });
 
         return tagId && <Tag
@@ -146,9 +146,9 @@ export default definePlugin({
         const perms = this.getPermissions(user, channel);
 
         for (const tag of tags) {
-            if (isChat && !settings.tagSettings[tag.name].showInChat)
+            if (isChat && !settings.tagSettings[tag.name]?.showInChat)
                 continue;
-            if (!isChat && !settings.tagSettings[tag.name].showInNotChat)
+            if (!isChat && !settings.tagSettings[tag.name]?.showInNotChat)
                 continue;
 
             // If the owner tag is disabled, and the user is the owner of the guild,
@@ -159,7 +159,9 @@ export default definePlugin({
                     user.id &&
                     isChat &&
                     !settings.tagSettings.OWNER.showInChat) ||
-                (!isChat &&
+                (GuildStore.getGuild(channel?.guild_id)?.ownerId ===
+                    user.id &&
+                    !isChat &&
                     !settings.tagSettings.OWNER.showInNotChat)
             )
                 continue;
diff --git a/src/equicordplugins/moreUserTags/settings.tsx b/src/equicordplugins/expandedUserTags/settings.tsx
similarity index 95%
rename from src/equicordplugins/moreUserTags/settings.tsx
rename to src/equicordplugins/expandedUserTags/settings.tsx
index 2aec12e6..a00a6afd 100644
--- a/src/equicordplugins/moreUserTags/settings.tsx
+++ b/src/equicordplugins/expandedUserTags/settings.tsx
@@ -96,9 +96,14 @@ export const settings = definePluginSettings({
         default: false,
         restartNeeded: true
     },
+    showWebhookTagFully: {
+        description: "Show Webhook tag in followed channels like announcements",
+        type: OptionType.BOOLEAN,
+        default: false
+    },
     tagSettings: {
         type: OptionType.COMPONENT,
         component: SettingsComponent,
         description: "fill me"
-    }
+    },
 });
diff --git a/src/equicordplugins/moreUserTags/styles.css b/src/equicordplugins/expandedUserTags/styles.css
similarity index 100%
rename from src/equicordplugins/moreUserTags/styles.css
rename to src/equicordplugins/expandedUserTags/styles.css
diff --git a/src/equicordplugins/moreUserTags/types.ts b/src/equicordplugins/expandedUserTags/types.ts
similarity index 100%
rename from src/equicordplugins/moreUserTags/types.ts
rename to src/equicordplugins/expandedUserTags/types.ts