diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 47fa3857f9a..718b45482a3 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -1210,7 +1210,18 @@
             if (($form && $form.find('.error:visible').size()) || !isCustomValidated)
               return false;
           }
-
+          
+					//when hypervisor is BareMetal (begin)   
+          var data = getData($wizard);	
+          if(('zone' in data) && (data.zone.hypervisor == 'BareMetal')) {					
+						if($('.zone-wizard:visible').find('#add_zone_guest_traffic_desc:visible').size() > 0) { //$steps.filter(':visible').index() == 6	 						 
+							showStep('launch');			
+							completeAction();	
+              return false;							
+						}
+					}
+					//when hypervisor is BareMetal (end)   		
+					
           if (!$target.closest('.button.next.final').size())
             showStep($steps.filter(':visible').index() + 2);
           else {
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 7677c15740d..60656e05850 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -2735,9 +2735,17 @@
               dataType: "json",
               success: function(json) {
                 args.data.returnedGuestNetwork.returnedVlanIpRange = json.createvlaniprangeresponse.vlan;
-                stepFns.addCluster({
-                  data: args.data
-                });
+                
+								//when hypervisor is BareMetal (begin)   						
+								if(args.data.cluster.hypervisor == "BareMetal") {
+								  alert('Zone creation is completed. Please refresh this page.');
+								}								
+								else {
+									stepFns.addCluster({
+										data: args.data
+									});
+								}
+								//when hypervisor is BareMetal (end)   
               },
               error: function(XMLHttpResponse) {
                 var errorMsg = parseXMLHttpResponse(XMLHttpResponse);