diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py
index d1455ee8..0fb604d9 100755
--- a/src/plugins/plugin_xep_0060.py
+++ b/src/plugins/plugin_xep_0060.py
@@ -381,7 +381,7 @@ class XEP_0060(object):
 
         def addMetadata(result):
             items, rsm_response = result
-            service_jid = service if service else jid.JID(client.jid.host)
+            service_jid = service if service else client.jid.userhostJID()
             metadata = {'service': service_jid,
                         'node': node,
                         'uri': self.getNodeURI(service_jid, node),