diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
index af529944ac..53e6194bcf 100644
--- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
+++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js
@@ -192,6 +192,8 @@ define(function(require) {
             inputs_div,
             template_json,
             {text_header: '<i class="fa fa-gears"></i> '+Locale.tr("Custom Attributes")});
+
+        $("span.template_name", context).text(template_json.VMTEMPLATE.NAME);
       },
       error: Notifier.onError
     });
diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs
index b1c2ccf6c2..b8c019e17c 100644
--- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs
+++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs
@@ -14,10 +14,10 @@
 {{! limitations under the License.                                             }}
 {{! -------------------------------------------------------------------------- }}
 
-<fieldset class="table_wrapper" style="display:none">
+<fieldset>
   <legend>{{tr "Template"}}</legend>
-  <div class="row selectTemplateTable">
-  </div>
+  <div class="table_wrapper row selectTemplateTable" style="display:none"/>
+  <p class="no_table_wrapper">{{tr "You selected the following Template:"}} <span class="template_name"/></p>
 </fieldset>
 <div class="row nameContainer">
   <div class="medium-4 columns">
diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
index d3a9d5167d..b3e961c02a 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js
@@ -84,6 +84,7 @@ define(function(require) {
 
     $(".selectTemplateTable", context).html(this.templatesTable.dataTableHTML);
     $(".table_wrapper", context).show();
+    $(".no_table_wrapper", context).hide();
 
     this.templatesTable.initialize();