diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 680c6ae44a7..a3d735a6860 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -377,6 +377,10 @@
             // Step 4: Data disk offering
             function(args) {
                 var isRequired = (args.currentData["select-template"] == "select-iso" ? true : false);
+                var templateFilter = 'executable'
+                if (isAdmin()) {
+                    templateFilter = 'all'
+                }
                 $.ajax({
                     url: createURL("listDiskOfferings"),
                     dataType: "json",
@@ -389,7 +393,7 @@
                                 url: createURL("listTemplates"),
                                 data: {
                                     id: args.currentData.templateid,
-                                    templatefilter: 'all'
+                                    templatefilter: templateFilter
                                 },
                                 dataType: "json",
                                 async: false,