diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml
index 0b3c179552..b1a8a8bce2 100644
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@@ -191,7 +191,7 @@
   </dl>
 </div>
 
-<div class="wizard-step col-md-8 col-centered" style="display: none;">
+<div class="wizard-step cloud-only col-md-8 col-centered" style="display: none;">
   <h4 class="step-title"></h4>
   <div class="row">
     <div class="col-md-12">
@@ -216,11 +216,12 @@
       <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
     </dd>
     <dd class="col-md-3 col-md-offset-6">
-      <button id="save-threading-settings" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
+      <button id="save-threading-settings" type="button" class="btn btn-md btn-block btn-primary next-button">Finish</button>
     </dd>
   </dl>
 </div>
 
+<!--
 <div id="congratulation-step" class="wizard-step cloud-only col-xs-12 col-centered" style="display: none;">
   <div class="row">
     <div class="col-xs-10 col-xs-offset-1">
@@ -285,6 +286,7 @@
     </div>
   </div>
 </div>
+-->
 
 <!--#include virtual="footer.html"-->
 <script src='/js/underscore-min.js'></script>
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 2ce23d3fcf..d02dce456e 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -149,7 +149,7 @@ function setupWizardSteps() {
 
     steps = $('.wizard-step');
     $(steps).each(function(i) {
-      $(this).children(".step-title").text("Step " + (i + 1) + " of " + (steps.length - 1));
+      $(this).children(".step-title").text("Step " + (i + 1) + " of " + (steps.length));
     });
 
     $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');