diff --git a/modules/admin.py b/modules/admin.py
index e6c25e8..da778e4 100644
--- a/modules/admin.py
+++ b/modules/admin.py
@@ -8,56 +8,64 @@ http://inamidst.com/phenny/
 """
 
 def join(phenny, input): 
-   """Join the specified channel. This is an admin-only command."""
-   # Can only be done in privmsg by an admin
-   if input.sender.startswith('#'): return
-   if input.admin: 
-      channel, key = input.group(1), input.group(2)
-      if not key: 
-         phenny.write(['JOIN'], channel)
-      else: phenny.write(['JOIN', channel, key])
+    """Join the specified channel. This is an admin-only command."""
+    # Can only be done in privmsg by an admin
+    if input.sender.startswith('#'): return
+    if input.admin: 
+        channel, key = input.group(1), input.group(2)
+        if not key: 
+            phenny.write(['JOIN'], channel)
+        else: phenny.write(['JOIN', channel, key])
 join.rule = r'\.join (#\S+)(?: *(\S+))?'
 join.priority = 'low'
 join.example = '.join #example or .join #example key'
 
+def autojoin(phenny, input): 
+    """Join the specified channel when invited by an admin."""
+    if input.admin: 
+        channel = input.group(1)
+        phenny.write(['JOIN'], channel)
+autojoin.event = 'INVITE'
+autojoin.rule = r'(.*)'
+
 def part(phenny, input): 
-   """Part the specified channel. This is an admin-only command."""
-   # Can only be done in privmsg by an admin
-   if input.sender.startswith('#'): return
-   if input.admin: 
-      phenny.write(['PART'], input.group(2))
+    """Part the specified channel. This is an admin-only command."""
+    # Can only be done in privmsg by an admin
+    if input.sender.startswith('#'): return
+    if input.admin: 
+        phenny.write(['PART'], input.group(2))
 part.commands = ['part']
 part.priority = 'low'
 part.example = '.part #example'
 
 def quit(phenny, input): 
-   """Quit from the server. This is an owner-only command."""
-   # Can only be done in privmsg by the owner
-   if input.sender.startswith('#'): return
-   if input.owner: 
-      phenny.write(['QUIT'])
-      __import__('os')._exit(0)
+    """Quit from the server. This is an owner-only command."""
+    # Can only be done in privmsg by the owner
+    if input.sender.startswith('#'): return
+    if input.owner: 
+        phenny.write(['QUIT'])
+        __import__('os')._exit(0)
 quit.commands = ['quit']
 quit.priority = 'low'
 
 def msg(phenny, input): 
-   # Can only be done in privmsg by an admin
-   if input.sender.startswith('#'): return
-   a, b = input.group(2), input.group(3)
-   if (not a) or (not b): return
-   if input.admin: 
-      phenny.msg(a, b)
+    # Can only be done in privmsg by an admin
+    if input.sender.startswith('#'): return
+    a, b = input.group(2), input.group(3)
+    if (not a) or (not b): return
+    if input.admin: 
+        phenny.msg(a, b)
 msg.rule = (['msg'], r'(#?\S+) (.+)')
 msg.priority = 'low'
 
 def me(phenny, input): 
-   # Can only be done in privmsg by an admin
-   if input.sender.startswith('#'): return
-   if input.admin: 
-      msg = '\x01ACTION %s\x01' % input.group(3)
-      phenny.msg(input.group(2), msg)
+    # Can only be done in privmsg by an admin
+    if input.sender.startswith('#'): return
+    if input.admin: 
+        msg = '\x01ACTION %s\x01' % input.group(3)
+        phenny.msg(input.group(2), msg)
 me.rule = (['me'], r'(#?\S+) (.*)')
 me.priority = 'low'
 
 if __name__ == '__main__': 
-   print(__doc__.strip())
+    print(__doc__.strip())