diff --git a/Html/scripts/WizardFinishPage.js b/Html/scripts/WizardFinishPage.js
new file mode 100644
index 0000000000..1633bf140e
--- /dev/null
+++ b/Html/scripts/WizardFinishPage.js
@@ -0,0 +1,16 @@
+var WizardFinishPage = {
+  
+    onFinish: function() {
+        
+        ApiClient.getServerConfiguration().done(function (config) {
+
+            config.IsStartupWizardCompleted = true;
+
+            ApiClient.updateServerConfiguration(config).done(function() {
+                Dashboard.navigate('dashboard.html');
+            });
+        });
+
+    }
+
+};
\ No newline at end of file
diff --git a/Html/wizardFinish.html b/Html/wizardFinish.html
index 06650c4f8a..3d51aa0bf9 100644
--- a/Html/wizardFinish.html
+++ b/Html/wizardFinish.html
@@ -16,7 +16,7 @@
 
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
-                    <button type="button" data-iconpos="right" data-icon="wrench" data-inline="true" onclick="Dashboard.navigate('dashboard.html');" data-theme="b">Go to the Dashboard</button>
+                    <button type="button" data-iconpos="right" data-icon="wrench" data-inline="true" onclick="WizardFinishPage.onFinish();" data-theme="b">Go to the Dashboard</button>
                 </div>
             </div>