diff --git a/xep-0369.xml b/xep-0369.xml
index cf7e8c40f..78df7a26d 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -1030,7 +1030,7 @@
 </iq>
 ]]></example>
 
-      <p>The channel responds to the user's sever with an IQ-result addressed to the user's bare JID, which will be processed as specified in MIX-PAM. This stanza includes the nodes to which the user has been successfully subscribed, as well as the bare JID that will be used for the user in this channel and added to the participant list.  The user's Stable Participant ID is returned as an 'id' attribute in the join.
+      <p>The channel responds to the user's sever with an IQ-result addressed to the user's bare JID, which will be processed as specified in MIX-PAM. This stanza includes the nodes to which the user has been successfully subscribed.  The user's Stable Participant ID is returned as an 'id' attribute in the join.
        The following example shows the result of the above request when the request is completed in full. </p>
       <example caption="Channel responds to User's Server"><![CDATA[
 <iq type='result'
diff --git a/xep-0405.xml b/xep-0405.xml
index a219a66a3..44374a0a9 100644
--- a/xep-0405.xml
+++ b/xep-0405.xml
@@ -291,7 +291,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     from='coven@mix.shakespeare.example'
     to='hag66@shakespeare.example'
     id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
-  <join xmlns='urn:xmpp:mix:core:1' jid='123456#coven@mix.shakespeare.example'>
+  <join xmlns='urn:xmpp:mix:core:1' id='123456'>
     <subscribe node='urn:xmpp:mix:nodes:messages'/>
     <subscribe node='urn:xmpp:mix:nodes:presence'/>
     <subscribe node='urn:xmpp:mix:nodes:participants'/>
@@ -311,8 +311,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     to='hag66@shakespeare.example/UUID-a1j/7533'
     id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
       <client-join xmlns='urn:xmpp:mix:pam:2'>
-        <join xmlns='urn:xmpp:mix:core:1'
-              jid='123456#coven@mix.shakespeare.example'>
+        <join xmlns='urn:xmpp:mix:core:1' id='123456'>
           <subscribe node='urn:xmpp:mix:nodes:messages'/>
           <subscribe node='urn:xmpp:mix:nodes:presence'/>
           <subscribe node='urn:xmpp:mix:nodes:participants'/>