diff --git a/src/accounts/xmpp/XmppConfigWidget.cpp b/src/accounts/xmpp/XmppConfigWidget.cpp
index 0df3cc9d2..a6001cc90 100644
--- a/src/accounts/xmpp/XmppConfigWidget.cpp
+++ b/src/accounts/xmpp/XmppConfigWidget.cpp
@@ -23,7 +23,9 @@
 
 
 #include "accounts/AccountManager.h"
+#include "accounts/ConfigStorage.h"
 #include "utils/Logger.h"
+#include "utils/TomahawkUtilsGui.h"
 
 #include <QMessageBox>
 
@@ -48,9 +50,41 @@ XmppConfigWidget::XmppConfigWidget( XmppAccount* account, QWidget *parent )
     m_ui->xmppPublishTracksCheckbox->setChecked( account->configuration().contains( "publishtracks" ) ? account->configuration()[ "publishtracks" ].toBool() : true);
     m_ui->xmppEnforceSecureCheckbox->setChecked( account->configuration().contains( "enforcesecure" ) ? account->configuration()[ "enforcesecure" ].toBool() : false);
     m_ui->jidExistsLabel->hide();
+    m_ui->xmppConfigFrame->hide();
 
 
     connect( m_ui->xmppUsername, SIGNAL( textChanged( QString ) ), SLOT( onCheckJidExists( QString ) ) );
+
+    if ( m_account->configuration()[ "read-only" ].toBool() )
+    {
+        m_ui->xmppUsername->setEnabled( false );
+        m_ui->xmppPassword->setEnabled( false );
+        m_ui->xmppServer->setEnabled( false );
+        m_ui->xmppPort->setEnabled( false );
+        m_ui->xmppEnforceSecureCheckbox->setEnabled( false );
+        m_ui->xmppPublishTracksCheckbox->setEnabled( false );
+    }
+
+    ConfigStorage* cs = AccountManager::instance()->configStorageForAccount( m_account->accountId() );
+    if ( cs->id() != "localconfigstorage" )
+    {
+        m_ui->xmppBlurb->hide();
+        m_ui->xmppConfigFrame->show();
+        m_ui->xmppConfigLabel->setText( tr( "Account provided by %1." )
+            .arg( cs->prettyName() ) );
+        m_ui->xmppConfigIcon->setPixmap( cs->icon().scaled( TomahawkUtils::defaultIconSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+        m_ui->xmppConfigLaunchDialog->setIcon( TomahawkUtils::defaultPixmap( TomahawkUtils::Configure ) );
+        connect( m_ui->xmppConfigLaunchDialog, SIGNAL( clicked() ),
+                 this, SLOT( launchExternalConfigDialog() ) );
+    }
+}
+
+
+void
+XmppConfigWidget::launchExternalConfigDialog()
+{
+    ConfigStorage* cs = AccountManager::instance()->configStorageForAccount( m_account->accountId() );
+    cs->execConfigDialog();
 }
 
 
diff --git a/src/accounts/xmpp/XmppConfigWidget.h b/src/accounts/xmpp/XmppConfigWidget.h
index 447b5fafb..bfdaa5da8 100644
--- a/src/accounts/xmpp/XmppConfigWidget.h
+++ b/src/accounts/xmpp/XmppConfigWidget.h
@@ -56,6 +56,7 @@ signals:
 
 private slots:
     void onCheckJidExists( const QString& jid );
+    void launchExternalConfigDialog();
 
 private:
     Ui::XmppConfigWidget *m_ui;
diff --git a/src/accounts/xmpp/XmppConfigWidget.ui b/src/accounts/xmpp/XmppConfigWidget.ui
index 8e16eaced..96eacb053 100644
--- a/src/accounts/xmpp/XmppConfigWidget.ui
+++ b/src/accounts/xmpp/XmppConfigWidget.ui
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>XmppConfigWidget</class>
- <widget class="QWidget" name="XmppConfig">
+ <widget class="QWidget" name="XmppConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>451</width>
-    <height>335</height>
+    <height>337</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>451</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Xmpp Configuration</string>
   </property>
@@ -35,7 +41,7 @@
         <string/>
        </property>
        <property name="pixmap">
-         <pixmap resource="resources.qrc">:/xmpp-account/xmpp-icon.png</pixmap>
+        <pixmap resource="resources.qrc">:/xmpp-account/xmpp-icon.png</pixmap>
        </property>
       </widget>
      </item>
@@ -69,15 +75,18 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
+         <width>0</width>
          <height>20</height>
         </size>
        </property>
@@ -85,9 +94,18 @@
      </item>
      <item>
       <widget class="QLabel" name="xmppBlurb">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Enter your Xmpp login to connect with your friends using Tomahawk!</string>
        </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
       </widget>
      </item>
      <item>
@@ -95,9 +113,12 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
+         <width>0</width>
          <height>20</height>
         </size>
        </property>
@@ -105,6 +126,85 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QFrame" name="xmppConfigFrame">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <property name="lineWidth">
+        <number>0</number>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_7">
+        <property name="spacing">
+         <number>5</number>
+        </property>
+        <property name="leftMargin">
+         <number>2</number>
+        </property>
+        <property name="topMargin">
+         <number>2</number>
+        </property>
+        <property name="rightMargin">
+         <number>2</number>
+        </property>
+        <property name="bottomMargin">
+         <number>2</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="xmppConfigIcon">
+          <property name="text">
+           <string notr="true"/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="xmppConfigLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="xmppConfigLaunchDialog">
+          <property name="toolTip">
+           <string>Configure</string>
+          </property>
+          <property name="text">
+           <string notr="true"/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
diff --git a/src/libtomahawk/accounts/ConfigStorage.cpp b/src/libtomahawk/accounts/ConfigStorage.cpp
index 8ee9fee76..07dac2233 100644
--- a/src/libtomahawk/accounts/ConfigStorage.cpp
+++ b/src/libtomahawk/accounts/ConfigStorage.cpp
@@ -37,5 +37,26 @@ ConfigStorage::~ConfigStorage()
 }
 
 
+QString
+ConfigStorage::prettyName() const
+{
+    return QString();
+}
+
+
+QPixmap
+ConfigStorage::icon() const
+{
+    return QPixmap();
+}
+
+
+bool
+ConfigStorage::execConfigDialog()
+{
+    return false;
+}
+
+
 } //ns
 } //ns
diff --git a/src/libtomahawk/accounts/ConfigStorage.h b/src/libtomahawk/accounts/ConfigStorage.h
index 9f3d9e6d7..7da7a82cd 100644
--- a/src/libtomahawk/accounts/ConfigStorage.h
+++ b/src/libtomahawk/accounts/ConfigStorage.h
@@ -41,6 +41,11 @@ public:
     virtual void init() = 0;
 
     virtual QString id() const = 0;
+    virtual QString prettyName() const;
+
+    virtual QPixmap icon() const;
+
+    virtual bool execConfigDialog();
 
     virtual QStringList accountIds() const = 0;
 
diff --git a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
index 3a422a47c..87b9241b9 100644
--- a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
+++ b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
@@ -28,6 +28,7 @@
 #include <TelepathyQt/PendingOperation>
 #include <TelepathyQt/AccountSet>
 
+#include <QProcess>
 #include <QTimer>
 
 
@@ -60,6 +61,37 @@ Tomahawk::Accounts::TelepathyConfigStorage::id() const
 }
 
 
+QString
+Tomahawk::Accounts::TelepathyConfigStorage::prettyName() const
+{
+    return tr( "the KDE instant messaging framework" );
+}
+
+
+QPixmap
+Tomahawk::Accounts::TelepathyConfigStorage::icon() const
+{
+    return QPixmap( ":/telepathy/kde.png" );
+}
+
+
+bool
+Tomahawk::Accounts::TelepathyConfigStorage::execConfigDialog()
+{
+    QProcess kcm;
+    kcm.start( "kcmshell4 kcm_ktp_accounts" );
+    if ( !kcm.waitForStarted() )
+        return false;
+
+    if ( !kcm.waitForFinished( 600000 ) )
+        return false;
+
+    //TODO: this should probably be async
+
+    return true;
+}
+
+
 void
 Tomahawk::Accounts::TelepathyConfigStorage::onTpAccountManagerReady( Tp::PendingOperation* op )
 {
@@ -172,7 +204,7 @@ Tomahawk::Accounts::TelepathyConfigStorage::load( const QString& accountId, Acco
 
     Tp::AccountPtr account = m_tpam->accountForObjectPath( accountIdToTelepathyPath( accountId ) );
 
-    cfg.accountFriendlyName = account->normalizedName();
+    cfg.accountFriendlyName = "Tp:" + account->normalizedName();
 
     cfg.enabled = true;
     cfg.acl = QVariantMap();
@@ -206,6 +238,8 @@ Tomahawk::Accounts::TelepathyConfigStorage::load( const QString& accountId, Acco
     QVariant credentials = c->credentials( m_credentialsServiceName, account->uniqueIdentifier() );
     if ( credentials.type() == QVariant::String )
         cfg.credentials[ "password" ] = credentials.toString();
+
+    cfg.configuration[ "read-only" ] = true;
 }
 
 
diff --git a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.h b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.h
index a829ee7c3..d88d65176 100644
--- a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.h
+++ b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.h
@@ -45,6 +45,10 @@ public:
     void init();
 
     QString id() const;
+    QString prettyName() const;
+    QPixmap icon() const;
+
+    bool execConfigDialog();
 
     QStringList accountIds() const;
 
diff --git a/src/libtomahawk/accounts/configstorage/telepathy/kde.png b/src/libtomahawk/accounts/configstorage/telepathy/kde.png
new file mode 100644
index 000000000..3efaaf808
Binary files /dev/null and b/src/libtomahawk/accounts/configstorage/telepathy/kde.png differ
diff --git a/src/libtomahawk/accounts/configstorage/telepathy/resources.qrc b/src/libtomahawk/accounts/configstorage/telepathy/resources.qrc
new file mode 100644
index 000000000..2dd0f273e
--- /dev/null
+++ b/src/libtomahawk/accounts/configstorage/telepathy/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/telepathy">
+        <file>kde.png</file>
+    </qresource>
+</RCC>