diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index 4603999d5..abe22b172 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -22,6 +22,6 @@
 </div>
 <div class="row">
     <div class="col-md-12 text-center">
-        <a class="btn btn-primary" href="#/step3" ng-disabled="setup_form.username.$invalid">Done</a>
+        <button class="btn btn-primary" ng-click="next('/step3', setup_form.username.$invalid || setup_form.password.$invalid)" ng-disabled="setup_form.username.$invalid || setup_form.password.$invalid">Done</button>
     </div>
 </div>
diff --git a/webadmin/src/views/setup/step3.html b/webadmin/src/views/setup/step3.html
index 19b437caa..0f84cf704 100644
--- a/webadmin/src/views/setup/step3.html
+++ b/webadmin/src/views/setup/step3.html
@@ -22,6 +22,6 @@
 </div>
 <div class="row">
     <div class="col-md-12 text-center">
-        <a class="btn btn-primary" href="#/step4" ng-disabled="setup_form.secretAccessKey.$invalid">Done</a>
+        <button class="btn btn-primary"  ng-click="next('/step4', setup_form.accessKeyId.$invalid || setup_form.secretAccessKey.$invalid)" ng-disabled="setup_form.accessKeyId.$invalid || setup_form.secretAccessKey.$invalid">Done</button>
     </div>
 </div>