diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
index cf86c6b9fc..c2dd958a16 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js
@@ -92,6 +92,8 @@ define(function(require) {
       if (rawType != undefined) {
         rawJSON['TYPE'] = rawType;
       }
+
+      rawJSON['VALIDATE'] = $("#raw_validate", context).is(":checked") ? 'YES' : 'NO';
     }
 
     if (!$.isEmptyObject(rawJSON)) { templateJSON['RAW'] = rawJSON; };
@@ -104,8 +106,13 @@ define(function(require) {
     if (rawJSON) {
       $('.raw_type', context).val(rawJSON['TYPE']);
       $('.raw_type', context).change();
+
       WizardFields.fillInput($('.raw_data', context), rawJSON['DATA']);
 
+      if (['yes', 'YES'].includes(rawJSON['VALIDATE'])) {
+        $("#raw_validate", context).prop('checked', 'checked');
+      }
+
       delete templateJSON.RAW;
     }
 
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs
index 48595a2d70..e12a8dfc35 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs
@@ -29,11 +29,19 @@
           </label>
         </div>
         <div class="medium-8 columns">
-          <label>
-            {{tr "Data"}}
-            {{{tip (tr "Raw data to be passed directly to the hypervisor")}}}
-            <textarea rows="2" type="text" class="raw_data"/>
-          </label>
+          <div class="row">
+            <div class="large-12 columns">
+              <label>
+                {{tr "Data"}}
+                {{{tip (tr "Raw data to be passed directly to the hypervisor")}}}
+                <textarea rows="2" type="text" class="raw_data"/>
+              </label>
+            </div>
+            <div class="large-12 columns">
+              <input type="checkbox" id="raw_validate" name="raw_validate">
+              <label for="raw_validate">{{tr "Validate"}}</label>
+            </div>
+          </div>
         </div>
       </div>
     </fieldset>