diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts
index 87b1844..09b8914 100644
--- a/src/commands/settings/automod.ts
+++ b/src/commands/settings/automod.ts
@@ -650,19 +650,19 @@
     channels?: string[],
     allowed?: {
         roles: string[],
-        user: string[]
+        users: string[]
     }
 }): Promise<{
     channels: string[],
     allowed: {
         roles: string[],
-        user: string[]
+        users: string[]
     }
 }> => {
     let closed = false;
-    if(!current) current = {channels: [], allowed: {roles: [], user: []}};
+    if(!current) current = {channels: [], allowed: {roles: [], users: []}};
     if(!current.channels) current.channels = [];
-    if(!current.allowed) current.allowed = {roles: [], user: []};
+    if(!current.allowed) current.allowed = {roles: [], users: []};
 
     const channelMenu = new ActionRowBuilder<ChannelSelectMenuBuilder>()
         .addComponents(
@@ -773,7 +773,7 @@
                 case "allowed": {
                     switch (i.values[0]) {
                         case "users": {
-                            current.allowed.user = await toSelectMenu(interaction, m, current.allowed.user, "member", "Mention Settings");
+                            current.allowed.users = await toSelectMenu(interaction, m, current.allowed.users, "member", "Mention Settings");
                             break;
                         }
                         case "roles": {
@@ -792,7 +792,7 @@
         channels: string[],
         allowed: {
             roles: string[],
-            user: string[]
+            users: string[]
         }
     };
 
diff --git a/src/commands/settings/moderation.ts b/src/commands/settings/moderation.ts
index c7f0dd0..336e53a 100644
--- a/src/commands/settings/moderation.ts
+++ b/src/commands/settings/moderation.ts
@@ -21,6 +21,7 @@
     while (!timedOut) {
         const config = await client.database.guilds.read(interaction.guild!.id);
         const moderation = config.moderation;
+        console.log(moderation)
         await interaction.editReply({
             embeds: [
                 new EmojiEmbed()
