diff --git a/src/irclib.py b/src/irclib.py
index bf5b57f45..0efa1abc8 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -774,7 +774,7 @@ class Irc(IrcCommandDispatcher):
         else:
             channel = None
         preInFilter = str(msg).rstrip('\r\n')
-        log.debug('Incoming message: %s', preInFilter)
+        log.debug('Incoming message (%s): %s', self.network, preInFilter)
 
         # Yeah, so this is odd.  Some networks (oftc) seem to give us certain
         # messages with our nick instead of our prefix.  We'll fix that here.
diff --git a/src/ircutils.py b/src/ircutils.py
index 24731be64..4c0aa8a88 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -539,7 +539,10 @@ class FloodQueue(object):
                                                       repr(self.queues))
 
     def key(self, msg):
-        return msg.user + '@' + msg.host
+        # This really ought to be configurable without subclassing, but for
+        # now, it works.
+        # used to be msg.user + '@' + msg.host but that was too easily abused.
+        return msg.host
 
     def getTimeout(self):
         if callable(self.timeout):