diff --git a/modules/auto_mode.py b/modules/auto_mode.py
index 6deff530..dc785adb 100644
--- a/modules/auto_mode.py
+++ b/modules/auto_mode.py
@@ -48,7 +48,7 @@ class Module(object):
             event["stderr"].write("'%s' already has automode %s" % (
                 target_user.nickname, mode_name))
         else:
-            automodes.append("o")
+            automodes.append(mode)
             event["target"].set_user_setting(target_user.get_id(), "automodes",
                 automodes)
             event["stdout"].write("Added automode %s for '%s'" % (
@@ -61,7 +61,7 @@ class Module(object):
             event["stderr"].write("'%s' doesn't have automode %s" % (
                 target_user.nickname, mode_name))
         else:
-            automodes.remove("o")
+            automodes.remove(mode)
             event["target"].set_user_setting(target_user.get_id(), "automodes",
                 automodes)
             event["stdout"].write("Removed automode %s from '%s'" % (