diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py
index 7de2c86..5afda38 100644
--- a/src/jcl/jabber/component.py
+++ b/src/jcl/jabber/component.py
@@ -317,6 +317,8 @@ class JCLComponent(Component, object):
         info_query = info_query.make_result_response()
         query = info_query.new_query("jabber:iq:gateway")
         query.newTextChild(query.ns(), "jid", jid)
+        # XEP-0100 - section 6: should be <jid> but PSI only work with <prompt>
+        query.newTextChild(query.ns(), "prompt", jid)
         self.stream.send(info_query)
         return 1
 
diff --git a/src/jcl/jabber/tests/component.py b/src/jcl/jabber/tests/component.py
index 6059a49..5270569 100644
--- a/src/jcl/jabber/tests/component.py
+++ b/src/jcl/jabber/tests/component.py
@@ -488,7 +488,7 @@ class JCLComponent_TestCase(unittest.TestCase):
         self.assertEquals(len(self.comp.stream.sent), 1)
         iq_sent = self.comp.stream.sent[0]
         self.assertEquals(iq_sent.get_to(), "user1@test.com")
-        self.assertEquals(len(iq_sent.xpath_eval("*/*")), 1)
+        self.assertEquals(len(iq_sent.xpath_eval("*/*")), 2)
         jid_nodes = iq_sent.xpath_eval("jig:query/jig:jid",
                                        {"jig" : "jabber:iq:gateway"})
         self.assertEquals(len(jid_nodes), 1)