diff --git a/base/BaseCommand.js b/base/BaseCommand.js
index c6bd2d6d..fc848c75 100644
--- a/base/BaseCommand.js
+++ b/base/BaseCommand.js
@@ -14,11 +14,11 @@ class BaseCommand {
 		/**
 		 * @type {Boolean}
 		 */
-		this.guildOnly = options.guildOnly || true;
+		this.guildOnly = (options.guildOnly === true ? true : false) || false;
 		/**
 		 * @type {Boolean}
 		 */
-		this.ownerOnly = options.ownerOnly || false;
+		this.ownerOnly = (options.ownerOnly === true ? true : false) || false;
 		this.dirname = options.dirname || false;
 		/**
 		 * @type {String}
diff --git a/commands/General/help.js b/commands/General/help.js
index 3d0bb3ee..a1c463b8 100644
--- a/commands/General/help.js
+++ b/commands/General/help.js
@@ -16,7 +16,7 @@ class Help extends BaseCommand {
 						.setDescription(client.translate("owner/reload:COMMAND"))),
 			aliases: [],
 			dirname: __dirname,
-			guildOnly: true,
+			guildOnly: false,
 			ownerOnly: false
 		});
 	}
diff --git a/events/CommandHandler.js b/events/CommandHandler.js
index 3b8eecee..92a908b6 100644
--- a/events/CommandHandler.js
+++ b/events/CommandHandler.js
@@ -26,7 +26,7 @@ class CommandHandler extends BaseEvent {
 		data.userData = userData;
 
 		if (command.guildOnly && !interaction.inGuild()) return interaction.replyT("misc:GUILD_ONLY", { ephemeral: true });
-		if (command.ownerOnly && interaction.member.id !== client.config.owner.id) return interaction.replyT("misc:OWNER_ONLY", { ephemeral: true });
+		if (command.ownerOnly && interaction.user.id !== client.config.owner.id) return interaction.replyT("misc:OWNER_ONLY", { ephemeral: true });
 
 		if (interaction.inGuild()) {
 			const guildData = await client.findOrCreateGuild({