diff --git a/sylk/applications/xmppgateway/xmpp/server.py b/sylk/applications/xmppgateway/xmpp/server.py
index eb0a56c..443c63e 100644
--- a/sylk/applications/xmppgateway/xmpp/server.py
+++ b/sylk/applications/xmppgateway/xmpp/server.py
@@ -1,145 +1,149 @@
 # Copyright (C) 2013 AG Projects. See LICENSE for details
 #
 
 from sipsimple.util import ISOTimestamp
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import error, xmlstream
 from twisted.words.protocols.jabber.jid import internJID
 from wokkel.component import InternalComponent, Router
 from wokkel.server import XMPPS2SServerFactory, DeferredS2SClientFactory
 
 from sylk.applications.xmppgateway.configuration import XMPPGatewayConfig
 from sylk.applications.xmppgateway.xmpp.logger import Logger
 
 __all__ = ['SylkRouter', 'SylkInternalComponent', 'SylkS2SServerFactory', 'xmpp_logger']
 
 
 xmpp_logger = Logger()
 
 
 class SylkInternalComponent(InternalComponent):
 
     def __init__(self, *args, **kwargs):
         InternalComponent.__init__(self, *args, **kwargs)
         self._iqDeferreds = {}
 
     def startService(self):
         InternalComponent.startService(self)
         self.xmlstream.addObserver('/iq[@type="result"]', self._onIQResponse)
         self.xmlstream.addObserver('/iq[@type="error"]', self._onIQResponse)
 
     def stopService(self):
         InternalComponent.stopService(self)
         iqDeferreds = self._iqDeferreds
         self._iqDeferreds = {}
         for d in iqDeferreds.itervalues():
             d.errback(xmlstream.TimeoutError("Shutting down"))
 
     def request(self, request):
         if (request.stanzaKind != 'iq' or request.stanzaType not in ('get', 'set')):
             return defer.fail(ValueError("Not a request"))
 
         element = request.toElement()
 
         # Make sure we have a trackable id on the stanza
         if not request.stanzaID:
             element.addUniqueId()
             request.stanzaID = element['id']
 
         # Set up iq response tracking
         d = defer.Deferred()
         self._iqDeferreds[element['id']] = d
 
         timeout = getattr(request, 'timeout', None)
 
         if timeout is not None:
             def onTimeout():
                 del self._iqDeferreds[element['id']]
                 d.errback(xmlstream.TimeoutError("IQ timed out"))
 
             call = reactor.callLater(timeout, onTimeout)
 
             def cancelTimeout(result):
                 if call.active():
                     call.cancel()
 
                 return result
 
             d.addBoth(cancelTimeout)
         self.send(element)
         return d
 
     def _onIQResponse(self, iq):
         try:
             d = self._iqDeferreds[iq["id"]]
         except KeyError:
             return
 
         del self._iqDeferreds[iq["id"]]
         iq.handled = True
         if iq['type'] == 'error':
             d.errback(error.exceptionFromStanza(iq))
         else:
             d.callback(iq)
 
 
 class SylkRouter(Router):
 
     def route(self, stanza):
         """
         Route a stanza. (subclassed to avoid vebose logging)
 
         @param stanza: The stanza to be routed.
         @type stanza: L{domish.Element}.
         """
         destination = internJID(stanza['to'])
 
         if destination.host in self.routes:
             self.routes[destination.host].send(stanza)
         else:
             self.routes[None].send(stanza)
 
 
 class SylkS2SServerFactory(XMPPS2SServerFactory):
+    noisy = False
+
     def onConnectionMade(self, xs):
         super(self.__class__, self).onConnectionMade(xs)
 
         def logDataIn(buf):
             buf = buf.strip()
             if buf:
                 xmpp_logger.msg("RECEIVED", ISOTimestamp.now(), buf)
 
         def logDataOut(buf):
             buf = buf.strip()
             if buf:
                 xmpp_logger.msg("SENDING", ISOTimestamp.now(), buf)
 
         if XMPPGatewayConfig.trace_xmpp:
             xs.rawDataInFn = logDataIn
             xs.rawDataOutFn = logDataOut
 
 
 class DeferredS2SClientFactory(DeferredS2SClientFactory):
+    noisy = False
+
     def onConnectionMade(self, xs):
         super(self.__class__, self).onConnectionMade(xs)
 
         def logDataIn(buf):
             buf = buf.strip()
             if buf:
                 xmpp_logger.msg("RECEIVED", ISOTimestamp.now(), buf)
 
         def logDataOut(buf):
             buf = buf.strip()
             if buf:
                 xmpp_logger.msg("SENDING", ISOTimestamp.now(), buf)
 
         if XMPPGatewayConfig.trace_xmpp:
             xs.rawDataInFn = logDataIn
             xs.rawDataOutFn = logDataOut
 
 
 # Patch Wokkel's DeferredS2SClientFactory to use our logger
 import wokkel.server
 wokkel.server.DeferredS2SClientFactory = DeferredS2SClientFactory
 del wokkel.server