diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 9b703d1b9..ec97c4d02 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -602,9 +602,7 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                 if (response.data.ret_data.debugging === 1) {
                     $('#debugging').prop('checked', true);
                 }
-                if (response.data.ret_data.searchIndex === 1) {
-                    $('#searchIndex').prop('checked', true);
-                }
+                $scope.searchIndexEnabled = response.data.ret_data.searchIndex === 1;
                 if (response.data.ret_data.maintenanceMode === 1) {
                     $('#maintenanceMode').prop('checked', true);
                 }
@@ -4204,9 +4202,7 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                 if (response.data.ret_data.debugging === 1) {
                     $('#debugging').prop('checked', true);
                 }
-                if (response.data.ret_data.searchIndex === 1) {
-                    $('#searchIndex').prop('checked', true);
-                }
+                $scope.searchIndexEnabled = response.data.ret_data.searchIndex === 1;
                 if (response.data.ret_data.maintenanceMode === 1) {
                     $('#maintenanceMode').prop('checked', true);
                 }
@@ -9073,7 +9069,7 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) {
                 $scope.operationFailed = false;
                 $scope.operationSuccessfull = true;
                 $scope.couldNotConnect = true;
-                $scope.openBaseDirBox = false;
+                $scope.openBaseDirChanged = false;
 
                 $scope.errorMessage = response.data.error_message;
 
diff --git a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
index bedf9ebc3..81ca0fedc 100644
--- a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
+++ b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
@@ -243,8 +243,9 @@
                                             <div class="custom-control custom-switch">
                                                 <input ng-click="UpdateWPSettings('searchIndex')"
                                                        type="checkbox"
-                                                       class="custom-control-input ng-pristine ng-untouched ng-valid ng-not-empty"
-                                                       id="searchIndex">
+                                                       class="custom-control-input"
+                                                       id="searchIndex"
+                                                       ng-model="searchIndexEnabled">
                                                 <label class="custom-control-label"
                                                        for="searchIndex"></label>
                                             </div>