diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html
index 13af3e7dc..9dfead8ca 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -15,21 +15,6 @@
 -->
 
 <script type="text/x-red" data-template-name="inject">
-<!--
-    <div class="form-row node-input-payload">
-        <label for="node-input-payloadType"><i class="fa fa-envelope"></i> <span data-i18n="common.label.payload"></span></label>
-        <select id="node-input-payloadType" style="width:73%">
-          <option value="date" data-i18n="inject.timestamp"></option>
-          <option value="string" data-i18n="inject.string"></option>
-          <option value="none" data-i18n="inject.blank"></option>
-        </select>
-    </div>
-
-    <div class="form-row" id="node-input-row-payload">
-        <label for="node-input-payload"></label>
-        <input type="text" id="node-input-payload" style="width:70%">
-    </div>
--->
     <div class="form-row">
         <label for="node-input-payload"><i class="fa fa-envelope"></i> <span data-i18n="common.label.payload"></span></label>
         <input type="text" id="node-input-payload" style="width:300px">
diff --git a/nodes/core/core/80-template.html b/nodes/core/core/80-template.html
index 0fa522330..4e800da21 100644
--- a/nodes/core/core/80-template.html
+++ b/nodes/core/core/80-template.html
@@ -19,28 +19,32 @@
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
+    <div class="form-row">
+        <label for="node-input-field"><i class="fa fa-edit"></i> <span data-i18n="template.label.property"></span></label>
+        <input type="text" id="node-input-field" placeholder="payload" style="width:250px;">
+        <input type="hidden" id="node-input-fieldType">
+    </div>
     <div class="form-row" style="margin-bottom: 0px;">
         <label for="node-input-template"><i class="fa fa-file-code-o"></i> <span data-i18n="template.label.template"></span></label>
         <input type="hidden" id="node-input-template" autofocus="autofocus">
-        <select id="node-input-format" style=" font-size: 0.8em; margin-bottom: 3px; width:110px; float:right;">
-            <option value="handlebars">mustache</option>
-            <option value="html">HTML</option>
-            <option value="json">JSON</option>
-            <option value="markdown">Markdown</option>
-            <option value="text">none</option>
-        </select>
+        <div style="float:right;margin-bottom: 3px; font-size: 0.8em;">
+            <span data-i18n="template.label.format"></span>:
+            <select id="node-input-format" style=" height: 20px; font-size: 1em !important; width:110px;">
+                <option value="handlebars">mustache</option>
+                <option value="html">HTML</option>
+                <option value="json">JSON</option>
+                <option value="markdown">Markdown</option>
+                <option value="text">none</option>
+            </select>
+        </div>
     </div>
     <div class="form-row node-text-editor-row">
         <div style="height: 250px;" class="node-text-editor" id="node-input-template-editor" ></div>
     </div>
-    <div class="form-row">
-        <label for="node-input-field"><i class="fa fa-edit"></i> <span data-i18n="template.label.property"></span></label>
-        msg.<input type="text" id="node-input-field" placeholder="payload" style="width:170px;">
-    </div>
 </script>
 
 <script type="text/x-red" data-help-name="template">
-    <p>Creates a new message based on the provided template.</p>
+    <p>Sets a property based on the provided template.</p>
     <p>This uses the <i><a href="http://mustache.github.io/mustache.5.html" target="_new">mustache</a></i> format.</p>
     <p>For example, when a template of:
     <pre>Hello {{name}}. Today is {{date}}</pre>
@@ -50,8 +54,10 @@
   date: "Monday"
   payload: ...
 }</pre>
-    <p>The resulting payload will be:
+    <p>The resulting property will be:
     <pre>Hello Fred. Today is Monday</pre>
+    <p>By default, mustache will escape any HTML entities in the values it substitutes.
+       To prevent this, use <code>{{{triple}}}</code> braces.
 </script>
 
 <script type="text/javascript">
@@ -61,6 +67,7 @@
         defaults: {
             name: {value:""},
             field: {value:"payload"},
+            fieldType: {value:"msg"},
             format: {value:"handlebars"},
             template: {value:"This is the payload: {{payload}} !"},
         },
@@ -72,6 +79,15 @@
         },
         oneditprepare: function() {
             var that = this;
+            if (!this.fieldType) {
+                this.fieldType = 'msg';
+            }
+            $("#node-input-field").typedInput({
+                default: 'msg',
+                options: ['msg','flow','global'],
+                typeField: $("#node-input-fieldType")
+            });
+
             function templateDialogResize() {
                 var rows = $("#dialog-form>div:not(.node-text-editor-row)");
                 var height = $("#dialog-form").height();
@@ -108,7 +124,7 @@
                 fields:['name','outputs']
             });
             this.editor.focus();
-            
+
             $("#node-input-format").change(function() {
                 var mod = "ace/mode/"+$("#node-input-format").val();
                 that.editor.getSession().setMode({
diff --git a/nodes/core/core/80-template.js b/nodes/core/core/80-template.js
index 7c84142d2..a2a02ce51 100644
--- a/nodes/core/core/80-template.js
+++ b/nodes/core/core/80-template.js
@@ -23,33 +23,20 @@ module.exports = function(RED) {
         this.name = n.name;
         this.field = n.field || "payload";
         this.template = n.template;
+        this.fieldType = n.fieldType || "msg";
+
         var node = this;
-
-        var b = node.field.split(".");
-        var i = 0;
-        var m = null;
-        var rec = function(obj) {
-            i += 1;
-            if ((i < b.length) && (typeof obj[b[i-1]] === "object")) {
-                rec(obj[b[i-1]]); // not there yet - carry on digging
-            }
-            else {
-                 if (i === b.length) { // we've finished so assign the value
-                     obj[b[i-1]] = mustache.render(node.template,m);
-                     node.send(m);
-                 }
-                 else {
-                     obj[b[i-1]] = {}; // needs to be a new object so create it
-                     rec(obj[b[i-1]]); // and carry on digging
-                 }
-            }
-        }
-
         node.on("input", function(msg) {
             try {
-                m = msg;
-                i = 0;
-                rec(msg);
+                var value = mustache.render(node.template,msg);
+                if (node.fieldType === 'msg') {
+                    RED.util.setMessageProperty(msg,node.field,value);
+                } else if (node.fieldType === 'flow') {
+                    node.context().flow.set(node.field,value);
+                } else if (node.fieldType === 'global') {
+                    node.context().global.set(node.field,value);
+                }
+                node.send(msg);
             } catch(err) {
                 node.error(err.message);
             }
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 710c77337..0d80233a0 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -136,7 +136,8 @@
     "template": {
         "label": {
             "template": "Template",
-            "property": "Property"
+            "property": "Property",
+            "format": "Syntax Highlight"
         },
         "templatevalue": "This is the payload: {{payload}} !"
     },