diff --git a/modules/auto_mode.py b/modules/auto_mode.py
index 3fbdc96c..f58c7bee 100644
--- a/modules/auto_mode.py
+++ b/modules/auto_mode.py
@@ -3,16 +3,25 @@
 class Module(object):
     def __init__(self, bot):
         self.bot = bot
+        bot.events.on("boot").on("done").hook(self.book_done)
         bot.events.on("channel").on("mode").hook(self.on_mode)
         bot.events.on("received").on("join").hook(self.on_join)
 
+    def validate_setchannel(self, s):
+        return s.lower() == "true"
+    def boot_done(self, event):
+        self.bot.events.on("postboot").on("configure").on(
+            "channelset").call(setting="automode",
+            help="Disable/Enable automode",
+            validate=self.validate_setchannel)
+
     def on_mode(self, event):
-        if event["channel"].get_setting("auto-mode", False):
+        if event["channel"].get_setting("automode", False):
             remove = event["remove"]
             channel = event["channel"]
             mode = event["mode"]
             args = event["args"]
 
     def on_join(self, event):
-        if event["channel"].get_setting("auto-mode", False):
+        if event["channel"].get_setting("automode", False):
             pass