diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index e5829e3f3..9948c20e4 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -680,15 +680,11 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                     PPPassword: '',
                 }
             }
-        } else if (setting === 'search-indexing') {
-            var data = {
-                WPid: $('#WPid').html(),
-                setting: setting,
-                settingValue: $scope.searchIndexEnabled ? 1 : 0
-            }
         } else {
             var settingValue = 0;
-            if ($('#' + setting).is(":checked")) {
+            if (setting === 'searchIndex') {
+                settingValue = $scope.searchIndexEnabled ? 1 : 0;
+            } else if ($('#' + setting).is(":checked")) {
                 settingValue = 1;
             }
             var data = {
@@ -704,10 +700,8 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
             }
         };
 
-
         $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
 
-
         function ListInitialDatas(response) {
             $scope.wordpresshomeloading = true;
             $('#wordpresshomeloading').hide();
@@ -4285,15 +4279,11 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
 
             }
 
-        } else if (setting === 'search-indexing') {
-            var data = {
-                WPid: $('#WPid').html(),
-                setting: setting,
-                settingValue: $scope.searchIndexEnabled ? 1 : 0
-            }
         } else {
             var settingValue = 0;
-            if ($('#' + setting).is(":checked")) {
+            if (setting === 'searchIndex') {
+                settingValue = $scope.searchIndexEnabled ? 1 : 0;
+            } else if ($('#' + setting).is(":checked")) {
                 settingValue = 1;
             }
             var data = {
diff --git a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
index 34261b536..9cc630d6b 100644
--- a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
+++ b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
@@ -241,11 +241,11 @@
                                         <div class="col-md-3">
                                             <h6 style="font-weight: bold">Search Engine Indexing</h6>
                                             <div class="custom-control custom-switch">
-                                                <input ng-click="UpdateWPSettings('search-indexing')"
-                                                       type="checkbox"
+                                                <input type="checkbox"
                                                        class="custom-control-input"
                                                        id="searchIndex"
-                                                       ng-model="searchIndexEnabled">
+                                                       ng-model="searchIndexEnabled"
+                                                       ng-change="UpdateWPSettings('searchIndex')">
                                                 <label class="custom-control-label"
                                                        for="searchIndex"></label>
                                             </div>