diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index 3ccd3a702..79ad9e064 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -5512,6 +5512,12 @@ void bot_subcommand_bot_create(Client *c, const Seperator *sep)
 
 	std::string bot_name = sep->arg[1];
 	bot_name = Strings::UcFirst(bot_name);
+
+	if (Strings::Contains(bot_name, "_")) {
+		c->Message(Chat::White, "Bot name cannot contain underscores!");
+		return;
+	}
+	
 	if (arguments < 2 || !sep->IsNumber(2)) {
 		c->Message(Chat::White, "Invalid class!");
 		return;