diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index 317be06958..1f44e84c1d 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -84,7 +84,7 @@
                                     <br />
                                 </div>
                             </div>
-                            <ul data-role="listview" class="ulForm">
+                            <ul data-role="listview" class="ulForm" style="margin-bottom:0!important;">
                                 <li>
                                     <label>${HeaderExtractChapterImagesFor}</label>
                                     <div data-role="controlgroup">
@@ -100,6 +100,13 @@
                                     </div>
                                 </li>
                             </ul>
+
+                            <div>
+                                <label for="chkExtractChaptersDuringLibraryScan">${LabelExtractChaptersDuringLibraryScan}</label>
+                                <input type="checkbox" id="chkExtractChaptersDuringLibraryScan" />
+                                <div class="fieldDescription">${LabelExtractChaptersDuringLibraryScanHelp}</div>
+                            </div>
+                            <br />
                         </div>
                     </div>
 
@@ -131,8 +138,8 @@
 
                                         <input type="checkbox" id="chkPeopleOthers" />
                                         <label for="chkPeopleOthers">${OptionOthers}</label>
-                                        <div class="fieldDescription">${HeaderDownloadPeopleMetadataForHelp}</div>
                                     </div>
+                                    <div class="fieldDescription">${HeaderDownloadPeopleMetadataForHelp}</div>
                                 </li>
                             </ul>
                         </div>
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index fb21295415..48a30a2843 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -37,6 +37,8 @@
         $('#chkDownloadChapterMovies', page).checked(config.DownloadMovieChapters).checkboxradio("refresh");
         $('#chkDownloadChapterEpisodes', page).checked(config.DownloadEpisodeChapters).checkboxradio("refresh");
 
+        $('#chkExtractChaptersDuringLibraryScan', page).checked(config.ExtractDuringLibraryScan).checkboxradio("refresh");
+
         renderChapterFetchers(page, config, providers);
 
         Dashboard.hideLoadingMsg();
@@ -205,6 +207,7 @@
 
             config.DownloadMovieChapters = $('#chkDownloadChapterMovies', form).checked();
             config.DownloadEpisodeChapters = $('#chkDownloadChapterEpisodes', form).checked();
+            config.ExtractDuringLibraryScan = $('#chkExtractChaptersDuringLibraryScan', form).checked();
 
             config.DisabledFetchers = $('.chkChapterFetcher:not(:checked)', form).get().map(function (c) {
 
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index 4040ed681b..63723f799a 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -50,7 +50,15 @@
 
     function navigateToNextPage() {
 
-        Dashboard.navigate('wizardservice.html');
+        ApiClient.getSystemInfo().done(function(info) {
+
+            if (info.SupportsRunningAsService) {
+                Dashboard.navigate('wizardservice.html');
+
+            } else {
+                Dashboard.navigate('wizardfinish.html');
+            }
+        });
     }
 
     $(document).on('pageshow', "#wizardSettingsPage", function () {
diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
index 2ab448bd29..12168508b9 100644
--- a/dashboard-ui/scripts/wizarduserpage.js
+++ b/dashboard-ui/scripts/wizarduserpage.js
@@ -1,9 +1,22 @@
 (function ($, document, window) {
 
-    function onSaveComplete() {
+    function onSaveComplete(user) {
+
+        var userId = user.Id;
+
+        var metadataKey = "xbmcmetadata";
+
         Dashboard.hideLoadingMsg();
 
-        Dashboard.navigate('wizardlibrary.html');
+        ApiClient.getNamedConfiguration(metadataKey).done(function (config) {
+
+            config.UserId = userId;
+
+            ApiClient.updateNamedConfiguration(metadataKey, config).done(function () {
+
+                Dashboard.navigate('wizardlibrary.html');
+            });
+        });
     }
 
     function wizardUserPage() {
@@ -25,7 +38,10 @@
 
                     user.Name = $('#txtUsername', form).val();
 
-                    ApiClient.updateUser(user).done(onSaveComplete);
+                    ApiClient.updateUser(user).done(function () {
+
+                        onSaveComplete(user);
+                    });
 
                 } else {