diff --git a/social/xmpp/92-xmpp.html b/social/xmpp/92-xmpp.html
index 6c4a29bf..92b0f3f3 100644
--- a/social/xmpp/92-xmpp.html
+++ b/social/xmpp/92-xmpp.html
@@ -1,5 +1,5 @@
 
-<script type="text/x-red" data-template-name="xmpp in">
+<script type="text/html" data-template-name="xmpp in">
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
@@ -19,7 +19,7 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="xmpp in">
+<script type="text/html" data-help-name="xmpp in">
     <p>Connects to an XMPP server to receive messages.</p>
     <p>The <b>Buddy</b> field is the jid of the buddy or room you want to receive messages from. Leave blank to receive from anyone.</p>
     <p>Incoming messages will appear as <code>msg.payload</code> on the first output, while <code>msg.topic</code> will contain who it is from.
@@ -50,7 +50,7 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="xmpp out">
+<script type="text/html" data-template-name="xmpp out">
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-bookmark"></i> Connect as</label>
         <input type="text" id="node-input-server">
@@ -76,7 +76,7 @@
     <div class="form-tips">The <b>To</b> field is optional. If not set uses the <code>msg.topic</code> property of the message.</div>
 </script>
 
-<script type="text/x-red" data-help-name="xmpp out">
+<script type="text/html" data-help-name="xmpp out">
     <p>Connects to an XMPP server to send messages.</p>
     <p>The <b>To</b> field is optional. If not set the <code>msg.topic</code> property of the message is used.</p>
     <p>If you are joining a room then the <b>To</b> field must be supplied.</p>
@@ -108,13 +108,13 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="xmpp-server">
-<!--    <div class="form-row node-input-server">
+<script type="text/html" data-template-name="xmpp-server">
+    <div class="form-row node-input-server">
         <label for="node-config-input-server"><i class="fa fa-bookmark"></i> Server</label>
-        <input class="input-append-left" type="text" id="node-config-input-server" placeholder="localhost" style="width: 40%;" >
+        <input class="input-append-left" type="text" id="node-config-input-server" placeholder="blah.im" style="width: 40%;" >
         <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-config-input-port" placeholder="Port" style="width:45px">
-    </div> -->
+    </div>
     <div class="form-row">
         <label for="node-config-input-user"><i class="fa fa-user"></i> JID</label>
         <input type="text" id="node-config-input-user" placeholder="joe@blah.im">
@@ -147,7 +147,7 @@
     });
 </script>
 
-<script type="text/x-red" data-help-name="xmpp-server">
+<script type="text/html" data-help-name="xmpp-server">
     <p>The connection to an XMPP server to send and receive messages.</p>
     <p>Connects to the standard C2S port 5222 on the server.</p>
     <p>The JID is the full username of the client used to connect to the server
diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js
index c0979ca8..9fab652f 100644
--- a/social/xmpp/92-xmpp.js
+++ b/social/xmpp/92-xmpp.js
@@ -6,8 +6,8 @@ module.exports = function(RED) {
 
     function XMPPServerNode(n) {
         RED.nodes.createNode(this,n);
-        // this.server = n.server;
-        // this.port = n.port;
+        this.server = n.server;
+        this.port = n.port;
         this.nickname = n.nickname;
         this.username = n.user;
         var credentials = this.credentials;
@@ -24,8 +24,8 @@ module.exports = function(RED) {
                 that.client.connect({
                     jid : that.username,
                     password : that.password,
-                    // host : node.host,
-                    //port : node.port,
+                    host : that.server,
+                    port : that.port,
                     //skipPresence : true,
                     reconnect : true,
                     preferred : "PLAIN"
diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index d957f7a5..a37f3b5d 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,9 +1,9 @@
 {
     "name"          : "node-red-node-xmpp",
-    "version"       : "0.2.3",
+    "version"       : "0.2.4",
     "description"   : "A Node-RED node to talk to an XMPP server",
     "dependencies"  : {
-        "simple-xmpp"   : "^1.3.0"
+        "simple-xmpp"   : "^1.3.1"
     },
     "repository" : {
         "type":"git",