diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js
index c9cc1391a5..c8f83e5bbb 100644
--- a/src/sunstone/public/app/utils/vcenter/templates.js
+++ b/src/sunstone/public/app/utils/vcenter/templates.js
@@ -201,7 +201,7 @@ define(function(require) {
 
       opts[ref] = {};
 
-      opts[ref].type = $(".modify_rp", row_context).val();
+      opts[ref].type = ($(".modify_rp", row_context).val() ? $(".modify_rp", row_context).val() : "default");
 
       var rpInput = $(".vcenter_rp_input", row_context);
       var rpParams = [];
diff --git a/src/sunstone/public/app/utils/vcenter/templates/row.hbs b/src/sunstone/public/app/utils/vcenter/templates/row.hbs
index ab1d3ad1e7..9b34c313dd 100644
--- a/src/sunstone/public/app/utils/vcenter/templates/row.hbs
+++ b/src/sunstone/public/app/utils/vcenter/templates/row.hbs
@@ -58,6 +58,7 @@
                 </label>
               </div>
             </div>
+            {{/if}}
             <div class="row vcenter_rp_input">
               <div class="large-12 large-centered columns" style="margin-top: 20px;margin-left: 11px">
                 <div class="medium-4 columns" id="folder_{{id}}">
@@ -90,7 +91,6 @@
                 </div>
               </div>
             </div>
-            {{/if}}
           </div>
         </div>
       </div>