diff --git a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js
index 1082f38506..6d4e19dcb8 100644
--- a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js
@@ -307,7 +307,7 @@ define(function(require) {
 
 
     $('[wizard_field="NAME"]',context).val(
-        element.NAME). // TODO escapeDoubleQuotes(htmlDecode( element.NAME ))).
+        TemplateUtils.escapeDoubleQuotes( TemplateUtils.htmlDecode(element.NAME) )).
         prop("disabled", true).
         prop('wizard_field_disabled', true);