diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html
index 7e5948ded..2f95820ed 100755
--- a/client/htmls/private/ajax/Settings/Dashboard.html
+++ b/client/htmls/private/ajax/Settings/Dashboard.html
@@ -119,6 +119,7 @@ <h5 class="widget-title" style="color:#4e5964;">
 
 //on click of new button to create a new wizard..
 $('#createNew').click(function(e) {
+    $('#wizardActionListLoader').show();
     clearActiveClasses();
     $('#orgDropdown option:selected').val('');
     $('.providerSelect').addClass('hidden');
@@ -126,10 +127,12 @@ <h5 class="widget-title" style="color:#4e5964;">
     $('#createNew').addClass('hidden');
     $('#startConfig a').addClass('green-btn').removeClass('process-btn');
     $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn');
+    $('#orgConfiguration a').attr('href','ajax/Settings/settingsWizard.html');
     $('#orgConfiguration a').trigger('click');
+    $('#wizardActionListLoader').hide();
 });
 $('#orgConfiguration a').trigger('click');
-var firstOrgValue;
+var firstOrgValue,currentOrgValue;
 $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
     $("#orgDropdown").empty();
     for (var i = 0; i < data.length; i++) {
@@ -163,6 +166,7 @@ <h5 class="widget-title" style="color:#4e5964;">
     if (selectedDropdownValue) {
         getOrgValues();
     } else {
+        $('.wizardFlow').empty();
         lastDropdownValue = $('#orgDropdown option:last').val();
     }
 });
@@ -177,6 +181,21 @@ <h5 class="widget-title" style="color:#4e5964;">
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
+$('#galleryConfiguration a').click(function(e) {
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+});
+
+$('#devopsConfiguration a').click(function(e) {
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+});
+
+$('#cmdbConfiguration a').click(function(e) {
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+});
+
 function changeWizardStatus(orgIdForSetup) {
     $('#wizardActionListLoader').show();
     $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html
index f27b06af7..88a71a894 100644
--- a/client/htmls/private/ajax/Settings/bgWizard.html
+++ b/client/htmls/private/ajax/Settings/bgWizard.html
@@ -18,7 +18,7 @@ <h4 class="widget-margin" style="color:black;">Create Business Group
                  </div>
                   <div class="col-lg-6 col-md-6">
                      <label for="">Organization<span class="control-label redSpan">&nbsp;*</span></label>
-                     <select id="orgname" class="chooseOrganization form-control width-100" cdata="catalyst" cat-validation="required">
+                     <select id="orgname" class="chooseOrganization orgBgDropdown form-control width-100" cdata="catalyst" cat-validation="required">
                      </select>
                   </div>
                </div>
@@ -33,10 +33,8 @@ <h4 class="widget-margin" style="color:black;">Create Business Group
        </div>
    </div>
 </form>
-
-
-
 <script>
+
     $('.providerSelect').removeClass('hidden');
     if (selectedDropdownValue) {
         var $optionSelect = $('<option></option').val(orgForBg).attr('rowid', selectedDropdownValue).html(orgForBg);
@@ -44,6 +42,7 @@ <h4 class="widget-margin" style="color:black;">Create Business Group
         $('.nextFormWizard').removeAttr('disabled');
     } else {
         $('#cancelWizard').addClass('hidden');
+        $('#orgname').empty();
         $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
             $("#orgDropdown").empty();
             for (var i = 0; i < data.length; i++) {
@@ -53,10 +52,9 @@ <h4 class="widget-margin" style="color:black;">Create Business Group
             orgNameForSetup = $('#orgDropdown option:last').attr('rowid');
             orgIdForSetup = $('#orgDropdown option:last').val();
             lastDropdownValue = $('#orgDropdown option:last').val();
-            $('#orgDropdown option:last').attr('selected', 'selected')
-            var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
-            $('#orgname').append($optionSelect);
-            getBgValues();
+            $('#orgDropdown option:last').attr('selected', 'selected');
+            var $optionSelectOrgBG = $('<option></option').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+            $('.orgBgDropdown').append($optionSelectOrgBG);
         });
     }
 
@@ -82,9 +80,12 @@ <h4 class="widget-margin" style="color:black;">Create Business Group
     });
 
     $(".nextFormWizard").click(function() {
+      if(selectedDropdownValue){
         getProjValues();
+      }
         $('.contentSetting').find('ol li#bgCreate').removeClass('active').addClass('green-btn');
         $('.contentSetting').find('ol li#projectCreate').addClass('active');
         $('.content').load("ajax/Settings/projWizard.html");
     });
+    
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html
index d19de1aa6..f2ddd8772 100644
--- a/client/htmls/private/ajax/Settings/configManagementWizard.html
+++ b/client/htmls/private/ajax/Settings/configManagementWizard.html
@@ -90,13 +90,13 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
       </div>
    </form>
 </div>
+<input type="hidden" id="configWizardValueNewEdit"/>
 <script>
  //jQuery time
  orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
  orgIdForSetup = $('#orgDropdown option:selected').val();
  var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
  $('#orgname').append($option);
-
  function bindChange_importPemFile() {
      $('input[type="file"]').off('change').on('change', function() {
          $(this).next().val(this.files[0].name);
@@ -107,7 +107,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
      //api call for getting the status of wizard
      var wizardStepsConfig = $('<ol id="configWizard" class="bwizard-steps clearfix clickable"><li aria-selected="true" id="chefCreate" class="active btn-2 chefCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/configManagementWizard.html" class="hidden-phone">Create Chef Server</a></li><li aria-selected="false" style="z-index: 3;" id="envCreate" class="btn-3 envCreate"><span class="label">2</span><a href="ajax/Settings/envWizard.html" class="not-activeAnchor hidden-phone">Create Environment</a></li><li aria-selected="false" style="z-index: 3;" id="teamCreate" class="btn-4 teamCreate"><span class="label">3</span><a href="ajax/Settings/teamWizard.html" class="not-activeAnchor hidden-phone">Create Team</a></li></ol>');
      $('.wizardFlow').append(wizardStepsConfig);
-
+     $('.btn-2 a').addClass('not-activeAnchor');
      function getConfigValues() {
          $.get('/d4dMasters/readmasterjsonnew/10', function(data) {
              for (var i = 0; i < data.length; i++) {
@@ -126,6 +126,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                      $knifeFileLocation.find('input.knifeFile').attr('disabled','disabled').val(data[i].kniferbfile_filename);
                      $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                      $('#saveConfigWizard').addClass('hidden');
+                     $('.nextFormWizard').removeAttr('disabled');
                  }
              }
          });
@@ -168,11 +169,14 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
      $('.btn-2 a').click(function(e) {
          e.preventDefault();
          clicked = false;
+         $('.btn-3 a').removeClass('not-activeAnchor');
+         $('.btn-4 a').removeClass('not-activeAnchor');
          $('.contentSetting').load(this.getAttribute('href'));
      });
      $('.envCreate a').click(function(e) {
          e.preventDefault();
          $('.content').empty();
+         $('.btn-2 a').removeClass('not-activeAnchor');
          getEnvValues();
          $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
          $(this).parent('.bwizard-steps li').addClass('active');
@@ -182,14 +186,14 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
      $('.btn-4 a').click(function(e) {
          e.preventDefault();
          $('.content').empty();
+         $('.btn-2 a').removeClass('not-activeAnchor');
          getTeamValues();
          $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
          $(this).parent('.bwizard-steps li').addClass('active');
          $('.content').load(this.getAttribute('href'));
      });
-     orgIdForSetup = selectedDropdownValue;
-     if (clicked) {
-        if(orgIdForSetup){
+
+     function configWizardStatus(orgIdForSetup) {
             $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
              if (data.currentStep.name === 'Config Management') {
                  if (data.currentStep.nestedSteps) {
@@ -201,6 +205,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                      } else if (nestedSteps[0].name === 'ChefServer' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'Environment' && nestedSteps[1].isCompleted === true && nestedSteps[2].name === 'Teams' && nestedSteps[2].isCompleted === false) {
                         $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                          $('.contentSetting').find('ol li#teamCreate').addClass('active');
+                         $('.btn-3 a').removeClass('not-activeAnchor');
                          $('.content').load('ajax/Settings/teamWizard.html');
                      } else {
 
@@ -208,6 +213,8 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                  }
              } else {
                  getConfigValues();
+                 getEnvValues();
+                 getTeamValues();
                  $('#saveConfigWizard').addClass('hidden');
                  $('.nextFormWizard').removeAttr('disabled');
                  $('.btn-3 a').removeClass('not-activeAnchor');
@@ -217,16 +224,31 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                  $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
              }
          });
+        $('#wizardActionListLoader').hide();
+     }
+     var configWizardStatusValue = $('#configWizardValueNewEdit').val('new');
+     var configWizardEditValue;
+     orgIdForSetup = selectedDropdownValue || firstOrgValue;
+     if (clicked) {
+        if(orgIdForSetup){
+            if(configWizardStatusValue){
+                configWizardStatus(orgIdForSetup);
+            }
         }
      } else {
         //comes when the chefServer is created and navigates back to it.
-        $('.btn-3 a').removeClass('not-activeAnchor');
-        $('.btn-4 a').removeClass('not-activeAnchor');
-        $('.btn-5 a').removeClass('not-activeAnchor');
-         getConfigValues();
+        if(orgIdForSetup){
+            configWizardEditValue = $('#configWizardValueNewEdit').val('edit');
+            if(configWizardEditValue){
+                $('#wizardActionListLoader').hide();
+                getConfigValues();
+                $('.btn-3 a').removeClass('not-activeAnchor');
+                $('.btn-4 a').removeClass('not-activeAnchor');
+                $('.nextFormWizard').removeAttr('disabled');
+            } 
+          } 
      }
 
-     $('#wizardActionListLoader').hide();
 
 
  function setfolderpath() {
@@ -243,12 +265,12 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
  });
 
  $(".nextFormWizard").click(function() {
-     
-     $('.content').empty();
+    $('.content').empty();
+     getEnvValues();
+     $('.btn-2 a').removeClass('not-activeAnchor');
      $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
      $('.contentSetting').find('ol li#envCreate').addClass('active');
      $('.content').load('ajax/Settings/envWizard.html');
-     getEnvValues();
  });
  
 
diff --git a/client/htmls/private/ajax/Settings/devopsRolesWizard.html b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
index ca01bfab0..bbfae17b8 100644
--- a/client/htmls/private/ajax/Settings/devopsRolesWizard.html
+++ b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
@@ -308,7 +308,7 @@ <h4 class="modal-title">
             $tr.append($tdName).append($tdAction);
             $repoDeployTbody.append($tr);
             $repoDetails.row.add($tr).draw();
-            $("#repodetailsModal").hide();
+            $("#repodetailsModal").modal('hide');
         }
         $("#repoNameCreate").empty();
         $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
diff --git a/client/htmls/private/ajax/Settings/envWizard.html b/client/htmls/private/ajax/Settings/envWizard.html
index 7d4641c35..19edda6ad 100644
--- a/client/htmls/private/ajax/Settings/envWizard.html
+++ b/client/htmls/private/ajax/Settings/envWizard.html
@@ -104,6 +104,14 @@ <h4 class="modal-title">Add a Chef Environment</h4>
 </div>
 
 <script>
+function preprocess() {
+     $('#createenvinchefform')[0].reset();
+     if (typeof $('#configname').find('option:selected').attr('rowid') == 'undefined') {
+         bootbox.alert('Select a Chef Server before adding an environments.');
+         return (false);
+     } else
+         return (true);
+ }
 $(document).ready(function(e){
    var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
    $('#orgname').append($optionOrg);
@@ -134,14 +142,7 @@ <h4 class="modal-title">Add a Chef Environment</h4>
 
    $('#orgname').trigger('change');
 
-   function preprocess() {
-       $('#createenvinchefform')[0].reset();
-       if (typeof $('#configname').find('option:selected').attr('rowid') == 'undefined') {
-           bootbox.alert('Select a Chef Server before adding an environments.');
-           return (false);
-       } else
-           return (true);
-   }
+   
    $('#createenvinchefform').submit(function(e) {
        var reqBodyEnv = {};
        var chefid = $('#configname').find('option:selected').attr('rowid');
@@ -248,12 +249,15 @@ <h4 class="modal-title">Add a Chef Environment</h4>
       $('.content').load(this.getAttribute('href'));
     });
    $(".nextFormWizard").click(function() {
-    $('.content').empty();
-     clickTeam = false;
-     getTeamValues();
-     $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-     $('.contentSetting').find('ol li#teamCreate').addClass('active');
-     $('.content').load('ajax/Settings/teamWizard.html');
+       $('.content').empty();
+       if(configWizardEditValue){
+          getTeamValues();
+       }
+       $('.btn-2 a').removeClass('not-activeAnchor');
+       $('.btn-3 a').removeClass('not-activeAnchor');
+       $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+       $('.contentSetting').find('ol li#teamCreate').addClass('active');
+       $('.content').load('ajax/Settings/teamWizard.html');
    });
 });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/galleryWizard.html b/client/htmls/private/ajax/Settings/galleryWizard.html
index 215b727f4..b9c336785 100644
--- a/client/htmls/private/ajax/Settings/galleryWizard.html
+++ b/client/htmls/private/ajax/Settings/galleryWizard.html
@@ -169,28 +169,31 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
           
 
         //api call for getting the status of wizard
+        orgIdForSetup = selectedDropdownValue || firstOrgValue 
         if(clicked){
-          $('#wizardActionListLoader').show();
-            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-            if (data.currentStep.nestedSteps) {
-                var nestedSteps = data.currentStep.nestedSteps;
-                if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
-                    nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === false &&
-                    nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
-                    $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                    $('.contentSetting').find('ol li#serviceCreate').addClass('active');
-                    $('.content').load('ajax/Settings/serviceCommandWizard.html');
-                } else if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
-                    nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === true &&
-                    nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
-                    $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                    $('.contentSetting').find('ol li#serviceCreate').removeClass('active').addClass('green-btn');
-                    $('.contentSetting').find('ol li#scriptCreate').addClass('active');
-                    $('.content').load('ajax/Settings/scriptWizard.html');
-                } else {}
-            }
-        });
-        $('#wizardActionListLoader').hide();
+          if(orgIdForSetup){
+              $('#wizardActionListLoader').show();
+                $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+                if (data.currentStep.nestedSteps) {
+                    var nestedSteps = data.currentStep.nestedSteps;
+                    if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
+                        nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === false &&
+                        nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
+                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#serviceCreate').addClass('active');
+                        $('.content').load('ajax/Settings/serviceCommandWizard.html');
+                    } else if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
+                        nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === true &&
+                        nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
+                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#serviceCreate').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#scriptCreate').addClass('active');
+                        $('.content').load('ajax/Settings/scriptWizard.html');
+                    } else {}
+                }
+            });
+            $('#wizardActionListLoader').hide();
+          }
         } else {
             //getTemplateValues();
             $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
diff --git a/client/htmls/private/ajax/Settings/projWizard.html b/client/htmls/private/ajax/Settings/projWizard.html
index eeeee50d4..8c00c8eb6 100644
--- a/client/htmls/private/ajax/Settings/projWizard.html
+++ b/client/htmls/private/ajax/Settings/projWizard.html
@@ -76,6 +76,7 @@ <h4 class="widget-margin" style="color:black;">Create Project
     getBusinessGroupName(selectedDropdownValue);
     $('.nextFormWizard').removeAttr('disabled');
 } else {
+    $('.btn-3 a').removeClass('not-activeAnchor');
     orgNameForSetup = $('#orgDropdown option:last').attr('rowid');
     orgIdForSetup = $('#orgDropdown option:last').val();
     $('#orgDropdown option:last').attr('selected', 'selected')
@@ -111,7 +112,7 @@ <h4 class="widget-margin" style="color:black;">Create Project
 
 $(".nextFormWizard").click(function() {
     $('#wizardActionListLoader').show();
-    $('#providerConfiguration a').attr('href','ajax/Settings/providerWizard.html');
+    $('#configManagement a').attr('href','ajax/Settings/configManagementWizard.html');
     $('#configManagement a').trigger('click');
     $('#startConfig a, #orgConfiguration a').addClass('green-btn').removeClass('process-btn');
     $('.wizardFlow').empty();
diff --git a/client/htmls/private/ajax/Settings/providerWizard.html b/client/htmls/private/ajax/Settings/providerWizard.html
index 859fb010c..06e274c4a 100644
--- a/client/htmls/private/ajax/Settings/providerWizard.html
+++ b/client/htmls/private/ajax/Settings/providerWizard.html
@@ -265,7 +265,6 @@ <h4 class="widget-margin" style="color:black;">Create Provider
    var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
    var providerIdForImage;
    $('#orgId').append($option);
-   
        var providerWizardFlow = $('<ol id="providerWizard" class="bwizard-steps clearfix clickable"><li aria-selected="true" id="providerCreate" class="active btn-2 providerCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/providerWizard.html" class="hidden-phone">Create Providers</a></li><li aria-selected="true" style="z-index: 3;" id="imageCreate" class="btn-3 imageCreate"><span class="label">2</span><a href="ajax/Settings/vmImageWizard.html" class="not-activeAnchor hidden-phone">Create VmImages</a></li></ol>');
        $('.wizardFlow').append(providerWizardFlow);
 
@@ -308,15 +307,13 @@ <h4 class="widget-margin" style="color:black;">Create Provider
         var providerIdForImage = $('#providerHiddenId').val();
         var providerNameForImage = $('#providerHiddenName').val();
          $('#myForm22').find('select#orgId').empty();
-         
            $.get('/vmimages', function(data) {
                 for(var i =0;i<data.length;i++){
                   if (orgIdForSetup === data[i].orgId[0]) {
                     if(providerIdForImage === data[i].providerId){
                     var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
                     $('#myForm22').find('select#orgId').append($option).attr('disabled','disabled');
-                    var $optionForOs = $('<option></option>').val(data[i].osName).html(data[i].osName);
-                    
+                    var $optionForOs = $('<option></option>').val(data[i].osName).html(data[i].osName);  
                       $('#myForm22').find('select.providerVMImageDisplay').remove();
                       $('#myForm22').find('input.imageNameForVM').val(data[i].name).attr('disabled','disabled');
                       $('#myForm22').find('input#providerIdHiddenName').removeClass('hidden').val(providerNameForImage);
@@ -338,19 +335,17 @@ <h4 class="widget-margin" style="color:black;">Create Provider
            $('.contentSetting').load(this.getAttribute('href'));
        });
        $('.btn-3 a').click(function(e) {
-         $('.content').empty();
            e.preventDefault();
            $('.nextFormWizard').removeAttr('disabled');
-           getVmImages();
            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active')
            $(this).parent('.bwizard-steps li').addClass('active');
            $('.content').load(this.getAttribute('href'));
+           getVmImages();
        });
        //api call for getting the status of wizard
-       if (clicked) {
-          if(orgIdForSetup){
-              $('#wizardActionListLoader').show();
-              $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+
+       function getProviderWizardStatus(orgIdForSetup) {
+            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
                if (data.currentStep.name === 'Provider Configuration') {
                    if (data.currentStep.nestedSteps) {
                        var nestedSteps = data.currentStep.nestedSteps;
@@ -365,20 +360,25 @@ <h4 class="widget-margin" style="color:black;">Create Provider
                    }
                } else {
                    getProviderValues();
-                   getVmImages();
                    $('.btn-3 a').removeClass('not-activeAnchor');
                    $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                    $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                }
            });
+       }
+       orgIdForSetup = selectedDropdownValue;
+       if (clicked) {
+          if(orgIdForSetup){
+              $('#wizardActionListLoader').show();
+              getProviderWizardStatus(orgIdForSetup);
           }
            $('#wizardActionListLoader').hide();
        } else {
-           getProviderValues();
-           getVmImages();
-           $('.btn-3 a').removeClass('not-activeAnchor');
-           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-           $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+         if(orgIdForSetup){
+            getProviderValues();
+            getVmImages();
+           $('.btn-3 a').removeClass('not-activeAnchor'); 
+         }
        }
   
 
diff --git a/client/htmls/private/ajax/Settings/serviceCommandWizard.html b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
index 614761943..a082ac607 100644
--- a/client/htmls/private/ajax/Settings/serviceCommandWizard.html
+++ b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
@@ -162,13 +162,13 @@ <h4 class="widget-margin" style="color:black;">Create Services</h4>
    </form>
 </div>
 <script>
-    $(document).ready(function(e){
-        orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
-        orgIdForSetup = $('#orgDropdown option:selected').val();
-        var $optionOrgService = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-        $('#orgname').append($optionOrgService);
-        $('#orgname').trigger('change');
-    });
+    
+    orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+    orgIdForSetup = $('#orgDropdown option:selected').val();
+    var $optionOrgService = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
+    $('#orgname').append($optionOrgService);
+    
+    
     $('#commandtype').change(function(e) {
         if (this.value == "Chef Cookbook/Recipe") {
             $(".CommandName").hide();
@@ -222,7 +222,7 @@ <h4 class="widget-margin" style="color:black;">Create Services</h4>
             $("#configname").trigger('change');
         });
     });
-
+    $('#orgname').trigger('change');
     function validateForm() {
         //Check for required parameter
         return (true);
diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html
index f33fb4921..eeda33d15 100644
--- a/client/htmls/private/ajax/Settings/settingsWizard.html
+++ b/client/htmls/private/ajax/Settings/settingsWizard.html
@@ -46,8 +46,10 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 <script>
 var wizardSteps = $('<ol id="wizardTab" class="bwizard-steps clearfix clickable" role="tablist"><li aria-selected="true" class="btn-2 orgCreate active" id="orgCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/settingsWizard.html" class="hidden-phone">Create Organization </a></li><li aria-selected="true" style="z-index: 3;" id="bgCreate" class="btn-3 bgCreate"><span class="label">2</span><a href="ajax/Settings/bgWizard.html" class="not-activeAnchor hidden-phone">Create Business group</a></li><li aria-selected="true" style="z-index: 2;" id="projectCreate" class="btn-4 projectCreate"><span class="label btn-1">3</span><a href="ajax/Settings/projWizard.html" class="not-activeAnchor hidden-phone">Create New Project</a></li></ol>');
 $('.wizardFlow').append(wizardSteps);
+//getOrgValues();
 
 function getOrgValues() {
+  //$('#myForm').find('input#orgname').val('');
     $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
         for (var i = 0; i < data.length; i++) {
             if (selectedDropdownValue === data[i].rowid || lastDropdownValue === data[i].rowid) {
@@ -65,13 +67,15 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
     $('#myForm2').find('select#orgname').empty();
     $.get('/d4dMasters/readmasterjsonnew/2', function(data) {
         for (var i = 0; i < data.length; i++) {
-            if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+            if (selectedDropdownValue === data[i].orgname_rowid[0] || lastDropdownValue === data[i].orgname_rowid[0]) {
                 $('#myForm2').find('input#productgroupname').val(data[i].productgroupname).attr('disabled', 'disabled');
                 var $optionBg = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
                 $('#myForm2').find('select#orgname').append($optionBg).attr('disabled', 'disabled');
                 $('#myForm2').find('button.saveBgForm').addClass('hidden');
+                $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
             }
         }
+        $('.nextFormWizard').removeAttr('disabled');
     });
 }
 
@@ -80,10 +84,10 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 function getProjValues() {
     $('#saveProject').attr('disabled', true);
     $('#myForm3').find('select#orgname').empty();
-    $('#myForm3').find('select#productgroupname').empty();
+   
     $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
         for (var i = 0; i < data.length; i++) {
-            if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+            if (selectedDropdownValue === data[i].orgname_rowid[0] || lastDropdownValue === data[i].orgname_rowid[0]) {
                 $('#myForm3').find('input#projectname').val(data[i].projectname).attr('disabled', 'disabled');
                 $('#myForm3').find('input#description').val(data[i].description).attr('disabled', 'disabled');
                 var $optionBgProj = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
@@ -93,9 +97,10 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
             }
         }
         $('#myForm3').find('select#orgname').change(function(e) {
+           $('#myForm3').find('select#productgroupname').empty();
             $.get('/d4dMasters/readmasterjsonnew/2', function(data) {
                 for (var i = 0; i < data.length; i++) {
-                    if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                    if (selectedDropdownValue === data[i].orgname_rowid[0] || lastDropdownValue === data[i].rowid) {
                         var $option = $('<option></option>').val(data[i].productgroupname).attr('rowid', data[i].rowid).html(data[i].productgroupname);
                         $('#myForm3').find('select#productgroupname').append($option).attr('disabled', 'disabled');
                     }
@@ -109,54 +114,12 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 $('.btn-2 a').click(function(e) {
     e.preventDefault();
     clicked = false;
-    if (selectedDropdownValue || lastDropdownValue) {
-      $('.nextFormWizard').removeAttr('disabled');
-      getOrgValues();
-    }
     $('.contentSetting').load(this.getAttribute('href'));
 });
-orgIdForSetup = selectedDropdownValue;
-if (clicked) {
-    if (orgIdForSetup) {
-        $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-            if (data.currentStep.name === 'Org Configuration') {
-                if (data.currentStep.nestedSteps) {
-                    var nestedSteps = data.currentStep.nestedSteps;
-                    if (nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === false && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false) {
-                       $('.btn-3 a').removeClass('not-activeAnchor');
-                       $('#saveOrg').addClass('hidden');
-                        activateOrg();
-                    } else if(nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === true && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false){
-                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                        $('.contentSetting wizardFlow').find('ol li#bgCreate').removeClass('active').addClass('green-btn');
-                        $('.contentSetting wizardFlow').find('ol li#projectCreate').addClass('active');
-                        $('.content').load('ajax/Settings/projWizard.html');
-                    } else {
 
-                    }
-                }
-            } else {
-              $('.btn-3 a').removeClass('not-activeAnchor');
-              $('.btn-4 a').removeClass('not-activeAnchor');
-              $('.nextFormWizard').removeAttr('disabled');
-              $('#saveOrg').addClass('hidden');
-                $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                $('.btn-3 a').parent('.bwizard-steps li').addClass('green-btn');
-                $('.btn-4 a').parent('.bwizard-steps li').addClass('green-btn');
-            }
-        });
-    }
-} else {
-  $('.btn-3 a').removeClass('not-activeAnchor');
-  $('.btn-4 a').removeClass('not-activeAnchor');
-   $('.nextFormWizard').removeAttr('disabled');
-  $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-  getOrgValues();
-}
 $('.btn-3 a').click(function(e) {
     e.preventDefault();
+    $('.content').empty();
     if (selectedDropdownValue || lastDropdownValue) {
         $('.nextFormWizard').removeAttr('disabled');
         getBgValues();
@@ -166,18 +129,72 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
     }
     $('.content').load(this.getAttribute('href'));
 });
+
 $('.btn-4 a').click(function(e) {
     e.preventDefault();
-    $('.content').load(this.getAttribute('href'));
-    if (selectedDropdownValue || lastDropdownValue) {
+    if (selectedDropdownValue) {
       $('.nextFormWizard').removeAttr('disabled');
         getProjValues();
     } else {
         $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
         $(this).parent('.bwizard-steps li').addClass('active');
     }
+    $('.content').load(this.getAttribute('href'));
 });
 
+function wizardStatus(orgIdForSetup) {
+  $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+      if (data.currentStep.name === 'Org Configuration') {
+          if (data.currentStep.nestedSteps) {
+              var nestedSteps = data.currentStep.nestedSteps;
+              if (nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === false && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false) {
+                 $('.btn-3 a').removeClass('not-activeAnchor');
+                 $('#saveOrg').addClass('hidden');
+                  activateOrg();
+              } else if(nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === true && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false){
+                  $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                  $('.contentSetting wizardFlow').find('ol li#bgCreate').removeClass('active').addClass('green-btn');
+                  $('.contentSetting wizardFlow').find('ol li#projectCreate').addClass('active');
+                  $('.content').load('ajax/Settings/projWizard.html');
+              } else {
+
+              }
+          }
+      } else {
+        $('.btn-3 a').removeClass('not-activeAnchor');
+        $('.btn-4 a').removeClass('not-activeAnchor');
+        $('.nextFormWizard').removeAttr('disabled');
+        $('#saveOrg').addClass('hidden');
+          $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+          $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+          $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+          $('.btn-3 a').parent('.bwizard-steps li').addClass('green-btn');
+          $('.btn-4 a').parent('.bwizard-steps li').addClass('green-btn');
+      }
+  });
+}
+orgIdForSetup = selectedDropdownValue;
+if (clicked) {
+    if (orgIdForSetup) {
+        wizardStatus(orgIdForSetup);
+    } else {
+    }
+} else {
+  //user comes when he is creating a new org setup
+  if(orgIdForSetup){
+    getOrgValues();
+    $('.btn-3 a').removeClass('not-activeAnchor');
+    $('.btn-4 a').removeClass('not-activeAnchor');
+    $('.nextFormWizard').removeAttr('disabled');
+    $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+    $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+  } else if(lastDropdownValue) {
+      getOrgValues();
+      $('.btn-3 a').removeClass('not-activeAnchor');
+      $('.nextFormWizard').removeAttr('disabled');
+  }
+}
+
 function activateOrg() {
     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
     $('.contentSetting').find('ol li#bgCreate').addClass('active');
@@ -198,6 +215,8 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 });
 $('.nextFormWizard').click(function(e) {
     activateOrg();
-    getBgValues();
+    if(selectedDropdownValue){
+      getBgValues();
+    }
 });
 </script>
\ No newline at end of file