diff --git a/social/xmpp/92-xmpp.html b/social/xmpp/92-xmpp.html
index 8cd0b64b..5b5c3933 100644
--- a/social/xmpp/92-xmpp.html
+++ b/social/xmpp/92-xmpp.html
@@ -1,7 +1,7 @@
 
 <script type="text/x-red" data-template-name="xmpp in">
     <div class="form-row">
-        <label for="node-input-server"><i class="fa fa-bookmark"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
@@ -50,7 +50,7 @@
 
 <script type="text/x-red" data-template-name="xmpp out">
     <div class="form-row">
-        <label for="node-input-server"><i class="fa fa-bookmark"></i> Server</label>
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
     </div>
     <div class="form-row">
diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js
index 000b04ee..dc873c99 100644
--- a/social/xmpp/92-xmpp.js
+++ b/social/xmpp/92-xmpp.js
@@ -78,18 +78,32 @@ module.exports = function(RED) {
         xmpp.on('online', function(data) {
             node.status({fill:"green",shape:"dot",text:"connected"});
             if ((node.join) && (node.from !== "")) {
-                xmpp.join(node.to+'/'+node.nick);
+                // disable chat history
+                var to = node.to+'/'+node.nick;
+                var stanza = new xmpp.Element('presence', {"to": to}).
+                    c('x', { xmlns: 'http://jabber.org/protocol/muc' }).
+                    c('history', { maxstanzas:0, seconds:1 });
+                xmpp.conn.send(stanza);
+                xmpp.join(to);
             }
         });
 
         xmpp.on('chat', function(from, message) {
             var msg = { topic:from, payload:message };
-            node.send([msg,null]);
+            if (!node.join && ((node.from === "") || (node.from === from))) {
+                node.send([msg,null]);
+            }
         });
 
         xmpp.on('groupchat', function(conference, from, message, stamp) {
+            if (!stamp) {stamp = Date.now(); }
+            //else { console.log("STAMP",stamp) }
             var msg = { topic:from, payload:message, room:conference, ts:stamp };
-            if (from != node.nick) { node.send([msg,null]); }
+            if (from != node.nick) {
+                if ((node.join) && (node.from === conference)) {
+                    node.send([msg,null]);
+                }
+            }
         });
 
         //xmpp.on('chatstate', function(from, state) {
@@ -170,7 +184,13 @@ module.exports = function(RED) {
         xmpp.on('online', function(data) {
             node.status({fill:"green",shape:"dot",text:"connected"});
             if ((node.join) && (node.from !== "")) {
-                xmpp.join(node.to+'/'+node.nick);
+                // disable chat history
+                var to = node.to+'/'+node.nick;
+                var stanza = new xmpp.Element('presence', {"to": to}).
+                    c('x', { xmlns: 'http://jabber.org/protocol/muc' }).
+                    c('history', { maxstanzas:0, seconds:1 });
+                xmpp.conn.send(stanza);
+                xmpp.join(to);
             }
         });
 
diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index e2176d39..8347ff2f 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-xmpp",
-    "version"       : "0.2.0",
+    "version"       : "0.2.1",
     "description"   : "A Node-RED node to talk to an XMPP server",
     "dependencies"  : {
         "simple-xmpp"   : "^1.3.0"