diff --git a/sqlupdates/2_0_0_TO_DEV.sql b/sqlupdates/2_0_0_TO_DEV.sql
index 969d3a8d..d68ccbae 100644
--- a/sqlupdates/2_0_0_TO_DEV.sql
+++ b/sqlupdates/2_0_0_TO_DEV.sql
@@ -65,4 +65,6 @@ UPDATE `users_pets` LEFT JOIN `rooms` ON `users_pets`.`room_id` = `rooms`.`id` S
 
 ALTER TABLE `users_settings` ADD COLUMN `forums_post_count` int(11) NULL DEFAULT 0 AFTER `perk_trade`;
 
+INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('catalog.guild.hc_required', '1');
+
 #END DATABASE UPDATE: 2.0.0 -> DEV
\ No newline at end of file
diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
index f341e9e6..d28961cf 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java
@@ -8,6 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler;
 import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
 import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildBoughtComposer;
+import com.eu.habbo.messages.outgoing.guilds.GuildEditFailComposer;
 import com.eu.habbo.messages.outgoing.guilds.GuildInfoComposer;
 import com.eu.habbo.plugin.events.guilds.GuildPurchasedEvent;
 
@@ -30,6 +31,11 @@ public class RequestGuildBuyEvent extends MessageHandler
             }
         }
 
+        if(Emulator.getConfig().getBoolean("catalog.guild.hc_required", true) && this.client.getHabbo().getHabboStats().getClubExpireTimestamp() < Emulator.getIntUnixTimestamp()) {
+            this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.HC_REQUIRED));
+            return;
+        }
+
         String name = this.packet.readString();
         String description = this.packet.readString();
 
@@ -39,6 +45,11 @@ public class RequestGuildBuyEvent extends MessageHandler
 
         if(r != null)
         {
+            if(r.hasGuild()) {
+                this.client.sendResponse(new GuildEditFailComposer(GuildEditFailComposer.ROOM_ALREADY_IN_USE));
+                return;
+            }
+
             if(r.getOwnerId() == this.client.getHabbo().getHabboInfo().getId())
             {
                 if (r.getGuildId() == 0)