diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
index 77f50662bf..2f8a7d8c47 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
@@ -79,6 +79,7 @@ define(function(require) {
 
   function _html() {
     return TemplateHTML({
+      'userInputsHTML': UserInputs.html(),
       'customTagsTableHTML': CustomTagsTable.html(),
       'contextFilesTableHTML': this.contextFilesTable.dataTableHTML
     });
@@ -146,6 +147,7 @@ define(function(require) {
       opt.attr('selected', 'selected');
     });
 
+    UserInputs.setup(context);
     CustomTagsTable.setup(context);
 
     var selectOptions = {
@@ -161,82 +163,6 @@ define(function(require) {
 
     that.contextFilesTable.initialize(selectOptions);
     that.contextFilesTable.refreshResourceTableSelect();
-
-    // TODO: bug, user_input_name pattern is ignored
-
-    context.on("click", ".add_service_custom_attr", function() {
-      $(".service_custom_attrs tbody", context).append(
-        '<tr>' +
-          '<td>' +
-            '<label>' + Locale.tr("Name") +
-              '<input class="user_input_name" type="text" pattern="[\\w]+"/>' +
-              '<small class="error">' + Locale.tr("Only word characters are allowed") + '</small>' +
-            '</label>' +
-          '</td>' +
-          '<td>' +
-            '<label>' + Locale.tr("Type") +
-              '<select class="user_input_type" >' +
-                '<option value="text">' +       Locale.tr("text")           + '</option>' +
-                '<option value="text64">' +     Locale.tr("text (base64)")  + '</option>' +
-                '<option value="password">' +   Locale.tr("password")       + '</option>' +
-                '<option value="number">' +     Locale.tr("number")         + '</option>' +
-                '<option value="number-float">'+Locale.tr("number (float)") + '</option>' +
-                '<option value="range">' +      Locale.tr("range")          + '</option>' +
-                '<option value="range-float">' +Locale.tr("range (float)")  + '</option>' +
-                '<option value="list">' +       Locale.tr("list")           + '</option>' +
-              '</select>' +
-            '</label>' +
-          '</td>' +
-          '<td>' +
-            '<label>' + Locale.tr("Description") +
-              '<textarea class="user_input_description"/>' +
-            '</label>' +
-
-            '<div class="user_input_type_right number number-float">' +
-              '<label class="user_input_opt">' + Locale.tr("Default value") +
-                '<input type=text class="user_input_initial" placeholder="42"/>' +
-              '</label>' +
-            '</div>' +
-
-            '<div class="user_input_type_right range range-float">' +
-              '<label class="user_input_opt">' + Locale.tr("Options") +
-                '<input type=text class="user_input_params" placeholder="2..16"/>' +
-              '</label>' +
-              '<label class="user_input_opt">' + Locale.tr("Default value") +
-                '<input type=text class="user_input_initial" placeholder="8"/>' +
-              '</label>' +
-            '</div>' +
-
-            '<div class="user_input_type_right list">' +
-              '<label class="user_input_opt">' + Locale.tr("Options") +
-                '<input type=text class="user_input_params" placeholder="optA,optB,optC"/>' +
-              '</label>' +
-              '<label class="user_input_opt">' + Locale.tr("Default value") +
-                '<input type=text class="user_input_initial" placeholder="optB"/>' +
-              '</label>' +
-            '</div>' +
-
-          '</td>' +
-          '<td>' +
-            '</br>' +
-            '<a href="#"><i class="fa fa-times-circle remove-tab"></i></a>' +
-          '</td>' +
-        '</tr>');
-
-        $("select.user_input_type", context).change();
-    });
-
-    context.on("change", "select.user_input_type", function() {
-      var row = $(this).closest("tr");
-      $(".user_input_type_right", row).hide();
-
-      $(".user_input_type_right."+this.value, row).show();
-    });
-
-    context.on("click", ".service_custom_attrs i.remove-tab", function() {
-      var tr = $(this).closest('tr');
-      tr.remove();
-    });
   }
 
   function _fillCustomizations(context, customizations) {
@@ -287,33 +213,11 @@ define(function(require) {
         contextJSON["TOKEN"] = "YES";
       }
 
-      var userInputsJSON = {};
-      $(".service_custom_attrs tbody tr", context).each(function() {
-        if ($(".user_input_name", $(this)).val()) {
-          var attr = {};
-          attr.name = $(".user_input_name", $(this)).val();
-          attr.mandatory = true;
-          attr.type = $(".user_input_type", $(this)).val();
-          attr.description = $(".user_input_description", $(this)).val();
+      var userInputsJSON = UserInputs.retrieve(context);
 
-          switch(attr.type){
-            case "number":
-            case "number-float":
-              attr.initial = $("."+attr.type+" input.user_input_initial", $(this)).val();
-              break;
-
-            case "range":
-            case "range-float":
-            case "list":
-              attr.params  = $("."+attr.type+" input.user_input_params", $(this)).val();
-              attr.initial = $("."+attr.type+" input.user_input_initial", $(this)).val();
-              break;
-          }
-
-          userInputsJSON[attr.name] = UserInputs.marshall(attr);
-
-          contextJSON[attr.name] = "$" + attr.name.toUpperCase();
-        }
+      $.each(userInputsJSON, function(key,value){
+        var name = key.toUpperCase();
+        contextJSON[name] = "$" + name;
       });
 
       var start_script = $("#START_SCRIPT", context).val();
@@ -363,36 +267,13 @@ define(function(require) {
     $("#network_context", context).removeAttr('checked');
 
     if (userInputsJSON) {
-      $.each(userInputsJSON, function(key, value) {
-        $(".add_service_custom_attr", context).trigger("click");
+      UserInputs.fill(context, templateJSON);
 
-        var context = $(".service_custom_attrs tbody tr", context).last();
-
-        $(".user_input_name", context).val(key);
-
-        var attr = UserInputs.unmarshall(value);
-
-        $(".user_input_type", context).val(attr.type).change();
-        $(".user_input_description", context).val(attr.description);
-
-        switch(attr.type){
-          case "number":
-          case "number-float":
-            $("."+attr.type+" input.user_input_initial", context).val(attr.initial);
-            break;
-
-          case "range":
-          case "range-float":
-          case "list":
-            $("."+attr.type+" input.user_input_params", context).val(attr.params);
-            $("."+attr.type+" input.user_input_initial", context).val(attr.initial);
-            break;
-        }
-
-        if (contextJSON) {
+      if (contextJSON) {
+        $.each(userInputsJSON, function(key, value){
           delete contextJSON[key];
-        }
-      });
+        });
+      }
 
       delete templateJSON['USER_INPUTS'];
     }
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs
index c6d285f917..e43f76c2c1 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs
@@ -102,35 +102,13 @@
       </div>
       <div class="row">
         <div class="large-12 columns">
-          <table class="service_custom_attrs policies_table dataTable">
-            <thead>
-              <tr>
-                <th colspan="4" style="font-size: 16px !important"> <i class="fa fa-lg fa-fw fa-cogs off-color"/>{{tr "User Inputs"}}
-                  {{{tip (tr "These attributes must be provided by the user when a new VM is intantatiated using each template. They will be included in the VM context")}}}
-                </th>
-              </tr>
-            </thead>
-            <thead>
-              <tr>
-                <th style="width:30%"></th>
-                <th style="width:20%"></th>
-                <th style="width:50%"></th>
-                <th style="width:3%"></th>
-              </tr>
-            </thead>
-            <tbody style="vertical-align:top">
-            </tbody>
-            <tfoot>
-              <tr>
-                <td colspan="4">
-                  <a href="#" class="add_service_custom_attr button small small-12 secondary radius">
-                    <i class="fa fa-plus"></i>
-                    {{tr "Add another attribute"}}
-                  </a>
-                </td>
-              </tr>
-            </tfoot>
-          </table>
+          <i class="fa fa-lg fa-fw fa-cogs off-color"/>{{tr "User Inputs"}}
+          {{{tip (tr "These attributes must be provided by the user when a new VM is intantatiated using each template. They will be included in the VM context")}}}
+        </div>
+      </div>
+      <div class="row">
+        <div class="large-12 columns">
+          {{{userInputsHTML}}}
         </div>
       </div>
     </div>
diff --git a/src/sunstone/public/app/utils/user-inputs.js b/src/sunstone/public/app/utils/user-inputs.js
index aba6da9ee1..2e47a569da 100644
--- a/src/sunstone/public/app/utils/user-inputs.js
+++ b/src/sunstone/public/app/utils/user-inputs.js
@@ -19,13 +19,25 @@ define(function(require) {
   var TemplateUtils = require('utils/template-utils');
   var VNetsTable = require('tabs/vnets-tab/datatable');
 
+  var TemplateHTML = require('hbs!./user-inputs/table');
+  var RowTemplateHTML = require('hbs!./user-inputs/row');
+
   //==============================================================================
   // VM & Service user inputs
   //==============================================================================
 
   return {
+    // User inputs edition
+    'html': _html,
+    'setup': _setup,
+    'fill': _fill,
+    'retrieve': _retrieve,
+
+    // Instantiate
     'vmTemplateInsert': _generateVMTemplateUserInputs,
     'serviceTemplateInsert': _generateServiceTemplateUserInputs,
+
+    // Utils
     'marshall': _marshall,
     'unmarshall': _unmarshall,
     'parse': _parse,
@@ -33,6 +45,97 @@ define(function(require) {
     'attributeInput': _attributeInput
   };
 
+  function _html(){
+    return TemplateHTML();
+  }
+
+  function _setup(context){
+
+    // TODO: bug, user_input_name pattern is ignored
+
+    context.on("click", ".add_user_input_attr", function() {
+      $(".user_input_attrs tbody", context).append(RowTemplateHTML());
+
+      $("select.user_input_type", context).change();
+    });
+
+    context.on("change", "select.user_input_type", function() {
+      var row = $(this).closest("tr");
+
+      $(".user_input_type_right", row).hide();
+      $(".user_input_type_right."+this.value, row).show();
+    });
+
+    context.on("click", ".user_input_attrs i.remove-tab", function() {
+      $(this).closest('tr').remove();
+    });
+  }
+
+  function _retrieve(context){
+    var userInputsJSON = {};
+
+    $(".user_input_attrs tbody tr", context).each(function() {
+      if ($(".user_input_name", $(this)).val()) {
+        var attr = {};
+        attr.name = $(".user_input_name", $(this)).val();
+        attr.mandatory = true;
+        attr.type = $(".user_input_type", $(this)).val();
+        attr.description = $(".user_input_description", $(this)).val();
+
+        switch(attr.type){
+          case "number":
+          case "number-float":
+            attr.initial = $("."+attr.type+" input.user_input_initial", $(this)).val();
+            break;
+
+          case "range":
+          case "range-float":
+          case "list":
+            attr.params  = $("."+attr.type+" input.user_input_params", $(this)).val();
+            attr.initial = $("."+attr.type+" input.user_input_initial", $(this)).val();
+            break;
+        }
+
+        userInputsJSON[attr.name] = _marshall(attr);
+      }
+    });
+
+    return userInputsJSON;
+  }
+
+  function _fill(context, templateJSON){
+    var userInputsJSON = templateJSON['USER_INPUTS'];
+
+    if (userInputsJSON) {
+      $.each(userInputsJSON, function(key, value) {
+        $(".add_user_input_attr", context).trigger("click");
+
+        var trcontext = $(".user_input_attrs tbody tr", context).last();
+
+        $(".user_input_name", trcontext).val(key);
+
+        var attr = _unmarshall(value);
+
+        $(".user_input_type", trcontext).val(attr.type).change();
+        $(".user_input_description", trcontext).val(attr.description);
+
+        switch(attr.type){
+          case "number":
+          case "number-float":
+            $("."+attr.type+" input.user_input_initial", trcontext).val(attr.initial);
+            break;
+
+          case "range":
+          case "range-float":
+          case "list":
+            $("."+attr.type+" input.user_input_params", trcontext).val(attr.params);
+            $("."+attr.type+" input.user_input_initial", trcontext).val(attr.initial);
+            break;
+        }
+      });
+    }
+  }
+
   // It will replace the div's html with a row for each USER_INPUTS
   // opts.text_header: header text for the text & password inputs
   // opts.network_header: header text for the network inputs
diff --git a/src/sunstone/public/app/utils/user-inputs/row.hbs b/src/sunstone/public/app/utils/user-inputs/row.hbs
new file mode 100644
index 0000000000..9c38ce4964
--- /dev/null
+++ b/src/sunstone/public/app/utils/user-inputs/row.hbs
@@ -0,0 +1,52 @@
+<tr>
+  <td>
+    <label>{{tr "Name"}}
+      <input class="user_input_name" type="text" pattern="[\\w]+"/>
+      <small class="error">{{tr "Only word characters are allowed"}}</small>
+    </label>
+  </td>
+  <td>
+    <label>{{tr "Type"}}
+      <select class="user_input_type" >
+        <option value="text">         {{tr "text"}}            </option>
+        <option value="text64">       {{tr "text (base64)"}}   </option>
+        <option value="password">     {{tr "password"}}        </option>
+        <option value="number">       {{tr "number"}}          </option>
+        <option value="number-float"> {{tr "number (float)"}}  </option>
+        <option value="range">        {{tr "range"}}           </option>
+        <option value="range-float">  {{tr "range (float)"}}   </option>
+        <option value="list">         {{tr "list"}}            </option>
+      </select>
+    </label>
+  </td>
+  <td>
+    <label>{{tr "Description"}}
+      <textarea class="user_input_description"/>
+    </label>
+    <div class="user_input_type_right number number-float">
+      <label class="user_input_opt">{{tr "Default value"}}
+        <input type=text class="user_input_initial" placeholder="42"/>
+      </label>
+    </div>
+    <div class="user_input_type_right range range-float">
+      <label class="user_input_opt">{{tr "Options"}}
+        <input type=text class="user_input_params" placeholder="2..16"/>
+      </label>
+      <label class="user_input_opt">{{tr "Default value"}}
+        <input type=text class="user_input_initial" placeholder="8"/>
+      </label>
+    </div>
+    <div class="user_input_type_right list">
+      <label class="user_input_opt">{{tr "Options"}}
+        <input type=text class="user_input_params" placeholder="optA,optB,optC"/>
+      </label>
+      <label class="user_input_opt">{{tr "Default value"}}
+        <input type=text class="user_input_initial" placeholder="optB"/>
+      </label>
+    </div>
+  </td>
+  <td>
+    </br>
+    <a href="#"><i class="fa fa-times-circle remove-tab"></i></a>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/src/sunstone/public/app/utils/user-inputs/table.hbs b/src/sunstone/public/app/utils/user-inputs/table.hbs
new file mode 100644
index 0000000000..86f2f2f236
--- /dev/null
+++ b/src/sunstone/public/app/utils/user-inputs/table.hbs
@@ -0,0 +1,22 @@
+<table class="user_input_attrs policies_table dataTable">
+  <thead>
+    <tr>
+      <th style="width:30%"></th>
+      <th style="width:20%"></th>
+      <th style="width:50%"></th>
+      <th style="width:3%"></th>
+    </tr>
+  </thead>
+  <tbody style="vertical-align:top">
+  </tbody>
+  <tfoot>
+    <tr>
+      <td colspan="4">
+        <a href="#" class="add_user_input_attr button small small-12 secondary radius">
+          <i class="fa fa-plus"></i>
+          {{tr "Add another attribute"}}
+        </a>
+      </td>
+    </tr>
+  </tfoot>
+</table>
\ No newline at end of file