diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
index 8d9fa8e8..a0d13549 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
@@ -129,9 +129,9 @@ public class BotSaveSettingsEvent extends MessageHandler {
 
                 case 5:
                     String name = this.packet.readString();
-                    boolean invalidName = name.length() > BotManager.MAXIMUM_NAME_LENGTH;
+                    boolean invalidName = name.length() > BotManager.MAXIMUM_NAME_LENGTH || name.contains("<") || name.contains(">");
                     if (!invalidName) {
-                        String filteredName = Emulator.getGameEnvironment().getWordFilter().filter(Jsoup.parse(name).text(), null);
+                        String filteredName = Emulator.getGameEnvironment().getWordFilter().filter(name, null);
                         invalidName = !name.equalsIgnoreCase(filteredName);
                         if (!invalidName) {
                             BotSavedNameEvent nameEvent = new BotSavedNameEvent(bot, name);