diff --git a/src/sip/SipHandler.cpp b/src/sip/SipHandler.cpp
index 59f846638..d9f524ba0 100644
--- a/src/sip/SipHandler.cpp
+++ b/src/sip/SipHandler.cpp
@@ -13,8 +13,8 @@
 
 SipHandler::SipHandler( QObject* parent )
     : QObject( parent )
+    , m_connected( false )
 {
-    m_connected = false;
     loadPlugins( findPlugins() );
 }
 
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 99d7ea296..6ab88a607 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -418,7 +418,8 @@ TomahawkApp::setupSIP()
 {
     qDebug() << Q_FUNC_INFO;
 
-    if( !arguments().contains( "--nosip" ) )
+    //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
+    if( !arguments().contains( "--nosip" ) && TomahawkSettings::instance()->jabberAutoConnect() )
     {
         m_xmppBot = new XMPPBot( this );
         qDebug() << "Connecting SIP classes";