diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
index c655333b84..cf0fa3a65a 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
@@ -286,6 +286,10 @@ define(function(require) {
 
     WizardFields.fill(context, element);
 
+    if(element.TOPOLOGY && element.TOPOLOGY.CORES) {
+      $('#CORES_PER_SOCKET').val(element.TOPOLOGY.CORES).change()
+    }
+
     // Update memory_gb with the value set in memory
     $("div.memory_input input", context).trigger("input");
 
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
index 85daf33a13..9420006c01 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
@@ -207,7 +207,9 @@ define(function(require) {
       var vcpuValue = $("div.vcpu_input input", context).val();
       if (vcpuValue !== "") {
         _generateCores(context);
-        $('#CORES_PER_SOCKET option[value="' + element.TEMPLATE.CORES_PER_SOCKET + '"]').prop('selected', true);
+        if(element.TEMPLATE.TOPOLOGY) {
+          $('#CORES_PER_SOCKET').val(element.TEMPLATE.TOPOLOGY.CORES).change()
+        }
       }
 
       vcpuInput.on("change keyup", function(e){