diff --git a/src/libtomahawk/source.cpp b/src/libtomahawk/source.cpp
index 0c24deb26..2f959141c 100644
--- a/src/libtomahawk/source.cpp
+++ b/src/libtomahawk/source.cpp
@@ -79,6 +79,10 @@ Source::friendlyName() const
     if ( m_friendlyname.isEmpty() )
         return m_username;
 
+    //TODO: this is a terrible assumption, help me clean this up, mighty muesli!
+    if ( m_friendlyname.contains( "@conference.") )
+        return QString(m_friendlyname).remove( 0, m_friendlyname.lastIndexOf( "/" )+1 ).append(" via MUC");
+
     if ( m_friendlyname.contains( "/tomahawk" ) )
         return m_friendlyname.left( m_friendlyname.indexOf( "/tomahawk" ) );
 
diff --git a/src/sip/SipHandler.cpp b/src/sip/SipHandler.cpp
index 12a2f3c10..ee423269e 100644
--- a/src/sip/SipHandler.cpp
+++ b/src/sip/SipHandler.cpp
@@ -189,7 +189,7 @@ SipHandler::onPeerOnline( const QString& jid )
         ControlConnection* conn = new ControlConnection( Servent::instance() );
 
         const QString& nodeid = Database::instance()->dbid();
-        conn->setName( jid.left( jid.indexOf( "/" ) ) );
+        conn->setName( jid ); //.left( jid.indexOf( "/" ) )
         conn->setId( nodeid );
 
         Servent::instance()->registerOffer( key, conn );