diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bba53217aae..6062135813d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13524,11 +13524,7 @@
                                                 items.push({
                                                     id: "nfs",
                                                     description: "nfs"
-                                                });
-                                                items.push({
-                                                    id: "SMB",
-                                                    description: "SMB/cifs"
-                                                });
+                                                });                                               
                                                 items.push({
                                                     id: "SharedMountPoint",
                                                     description: "SharedMountPoint"
@@ -13549,11 +13545,7 @@
                                                 items.push({
                                                     id: "nfs",
                                                     description: "nfs"
-                                                });
-                                                items.push({
-                                                    id: "SMB",
-                                                    description: "SMB/cifs"
-                                                });
+                                                });                                               
                                                 items.push({
                                                     id: "PreSetup",
                                                     description: "PreSetup"
@@ -13570,11 +13562,7 @@
                                                 items.push({
                                                     id: "nfs",
                                                     description: "nfs"
-                                                });
-                                                items.push({
-                                                    id: "SMB",
-                                                    description: "SMB/cifs"
-                                                });
+                                                });                                               
                                                 items.push({
                                                     id: "vmfs",
                                                     description: "vmfs"
@@ -13582,16 +13570,21 @@
                                                 args.response.success({
                                                     data: items
                                                 });
+                                            } else if (selectedClusterObj.hypervisortype == "Hyperv") {
+                                                var items = [];
+                                                items.push({
+                                                    id: "SMB",
+                                                    description: "SMB/cifs"
+                                                });
+                                                args.response.success({
+                                                    data: items
+                                                });
                                             } else if (selectedClusterObj.hypervisortype == "Ovm") {
                                                 var items = [];
                                                 items.push({
                                                     id: "nfs",
                                                     description: "nfs"
-                                                });
-                                                items.push({
-                                                    id: "SMB",
-                                                    description: "SMB/cifs"
-                                                });
+                                                });                                                
                                                 items.push({
                                                     id: "ocfs2",
                                                     description: "ocfs2"
@@ -13604,11 +13597,7 @@
                                                 items.push({
                                                     id: "nfs",
                                                     description: "nfs"
-                                                });
-                                                items.push({
-                                                    id: "SMB",
-                                                    description: "SMB/cifs"
-                                                });
+                                                });                                               
                                                 items.push({
                                                     id: "SharedMountPoint",
                                                     description: "SharedMountPoint"
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index c5db0f9ed9f..f84812eb404 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1473,11 +1473,7 @@
                                 items.push({
                                     id: "nfs",
                                     description: "nfs"
-                                });
-                                items.push({
-                                    id: "SMB",
-                                    description: "SMB/cifs"
-                                });
+                                });                               
                                 items.push({
                                     id: "SharedMountPoint",
                                     description: "SharedMountPoint"
@@ -1494,11 +1490,7 @@
                                 items.push({
                                     id: "nfs",
                                     description: "nfs"
-                                });
-                                items.push({
-                                    id: "SMB",
-                                    description: "SMB/cifs"
-                                });
+                                });                               
                                 items.push({
                                     id: "PreSetup",
                                     description: "PreSetup"
@@ -1515,11 +1507,7 @@
                                 items.push({
                                     id: "nfs",
                                     description: "nfs"
-                                });
-                                items.push({
-                                    id: "SMB",
-                                    description: "SMB/cifs"
-                                });
+                                });                                
                                 items.push({
                                     id: "vmfs",
                                     description: "vmfs"
@@ -1527,16 +1515,21 @@
                                 args.response.success({
                                     data: items
                                 });
+                            } else if (selectedClusterObj.hypervisortype == "Hyperv") {    
+                            	var items = []; 
+                            	items.push({
+                                    id: "SMB",
+                                    description: "SMB/cifs"
+                                });
+                            	args.response.success({
+                                    data: items
+                                });
                             } else if (selectedClusterObj.hypervisortype == "Ovm") {
                                 var items = [];
                                 items.push({
                                     id: "nfs",
                                     description: "nfs"
-                                });
-                                items.push({
-                                    id: "SMB",
-                                    description: "SMB/cifs"
-                                });
+                                });                                
                                 items.push({
                                     id: "ocfs2",
                                     description: "ocfs2"
@@ -1549,11 +1542,7 @@
                                 items.push({
                                     id: "nfs",
                                     description: "nfs"
-                                });
-                                items.push({
-                                    id: "SMB",
-                                    description: "SMB/cifs"
-                                });
+                                });                               
                                 items.push({
                                     id: "SharedMountPoint",
                                     description: "SharedMountPoint"