diff --git a/plugins/Plugin/plugin.py b/plugins/Plugin/plugin.py
index ab2776e1d..2bce5bced 100644
--- a/plugins/Plugin/plugin.py
+++ b/plugins/Plugin/plugin.py
@@ -100,7 +100,7 @@ class Plugin(callbacks.Plugin):
             return
         module = cb.classModule
         if hasattr(module, '__author__') and module.__author__:
-            irc.reply(utils.web.mungeEmail(str(module.__author__)))
+            irc.reply(str(module.__author__))
         else:
             irc.reply('That plugin doesn\'t have an author that claims it.')
     author = wrap(author, [('plugin')])
diff --git a/src/__init__.py b/src/__init__.py
index 3115204a7..68ca7025d 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -43,8 +43,9 @@ class Author(object):
         self.email = email
 
     def __str__(self):
-        return '%s (%s) <%s>' % (self.name, self.nick, self.email)
-    
+        return '%s (%s) <%s>' % (self.name, self.nick,
+                                 utils.web.mungeEmail(self.email))
+
 class authors(object): # This is basically a bag.
     jemfinch = Author('Jeremy Fincher', 'jemfinch', 'jemfinch@users.sf.net')
     jamessan = Author('James Vega', 'jamessan', 'jamessan@users.sf.net')