diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
index 069d18f9ab..702b309b7f 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
@@ -161,8 +161,12 @@ define(function(require) {
 
       if (this.value == "vcenter"){
         $("#vcenter_template_ref", context).attr("required", "");
+        $("#vcenter_instance_id", context).attr("required", "");
+        $("#vcenter_ccr_ref", context).attr("required", "");
       } else {
         $("#vcenter_template_ref", context).removeAttr("required");
+        $("#vcenter_instance_id", context).removeAttr("required");
+        $("#vcenter_ccr_ref", context).removeAttr("required");
       }
       // There is another listener in context.js setup
     });
@@ -188,6 +192,8 @@ define(function(require) {
       templateJSON["MEMORY_COST"] = templateJSON["MEMORY_COST"] * 1024;
     if (templateJSON["HYPERVISOR"] == 'vcenter') {
       templateJSON["VCENTER_TEMPLATE_REF"] = WizardFields.retrieveInput($("#vcenter_template_ref", context));
+      templateJSON["VCENTER_CCR_REF"] = WizardFields.retrieveInput($("#vcenter_ccr_ref", context));
+      templateJSON["VCENTER_INSTANCE_ID"] = WizardFields.retrieveInput($("#vcenter_instance_id", context));
 
       if (Config.isFeatureEnabled("vcenter_vm_folder")) {
         templateJSON["VCENTER_VM_FOLDER"] = WizardFields.retrieveInput($("#vcenter_vm_folder", context))
@@ -309,6 +315,16 @@ define(function(require) {
       delete templateJSON["VCENTER_TEMPLATE_REF"];
     }
 
+    if(templateJSON["VCENTER_CCR_REF"]){
+      WizardFields.fillInput($("#vcenter_ccr_ref", context), templateJSON["VCENTER_CCR_REF"]);
+      delete templateJSON["VCENTER_CCR_REF"];
+    }
+
+    if(templateJSON["VCENTER_INSTANCE_ID"]){
+      WizardFields.fillInput($("#vcenter_instance_id", context), templateJSON["VCENTER_INSTANCE_ID"]);
+      delete templateJSON["VCENTER_INSTANCE_ID"];
+    }
+
     CapacityCreate.fill($("div.capacityCreate", context), templateJSON);
 
     WizardFields.fill(context, templateJSON);
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
index 89a5ca02f6..1a06c52380 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
@@ -62,6 +62,20 @@
       <input type="text" id="vcenter_template_ref"/>
     </div>
   </div>
+  <div class="row hypervisor only_vcenter" style="display: none;">
+    <div class="medium-6 columns">
+      <label  for="vcenter_ccr_ref">
+        {{tr "vCenter Cluster Ref"}}
+      </label>
+      <input type="text" id="vcenter_ccr_ref"/>
+    </div>
+    <div class="medium-6 columns">
+      <label  for="vcenter_instance_id">
+        {{tr "vCenter Instance ID"}}
+      </label>
+      <input type="text" id="vcenter_instance_id"/>
+    </div>
+  </div>
   <div class="vcenter_rp_input row">
      <div class="large-3 medium-6 columns">
        <label>