diff --git a/slixmpp/componentxmpp.py b/slixmpp/componentxmpp.py
index b00e084e..b4e4f52c 100644
--- a/slixmpp/componentxmpp.py
+++ b/slixmpp/componentxmpp.py
@@ -55,7 +55,7 @@ class ComponentXMPP(BaseXMPP):
         BaseXMPP.__init__(self, jid, default_ns)
 
         self.auto_authorize = None
-        self.stream_header = "<stream:stream %s %s to='%s'>" % (
+        self.stream_header = '<stream:stream %s %s to="%s">' % (
                 'xmlns="jabber:component:accept"',
                 'xmlns:stream="%s"' % self.stream_ns,
                 jid)
@@ -68,6 +68,8 @@ class ComponentXMPP(BaseXMPP):
         self.plugin_whitelist = plugin_whitelist
         self.is_component = True
 
+        self.sessionstarted = False
+
         self.register_handler(
                 Callback('Handshake',
                          MatchXPath('{jabber:component:accept}handshake'),
@@ -145,7 +147,7 @@ class ComponentXMPP(BaseXMPP):
         :param xml: The reply handshake stanza.
         """
         self.session_bind_event.set()
-        self.session_started_event.set()
+        self.sessionstarted = True
         self.event('session_bind', self.boundjid)
         self.event('session_start')