diff --git a/lib/SvelteUi/app/src/lib/SetupPanel.svelte b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
index 087a71f6..dde0ed40 100644
--- a/lib/SvelteUi/app/src/lib/SetupPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
@@ -108,10 +108,6 @@
                 </div>
             </div>
             {/if}
-            <div class="my-3">
-                <label><input type="checkbox" name="sf" value="true" class="rounded mb-1"/> Enable one-click upgrade (implies data collection)</label><br/>
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Data-collection-on-one-click-firmware-upgrade" target="_blank" class="text-blue-600 hover:text-blue-800">Read more</a>
-            </div>
             <div class="my-3">
                 <button type="submit" class="btn-pri">Save</button>
             </div>
diff --git a/lib/SvelteUi/app/src/lib/VendorPanel.svelte b/lib/SvelteUi/app/src/lib/VendorPanel.svelte
index 185de3dd..dac12b65 100644
--- a/lib/SvelteUi/app/src/lib/VendorPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/VendorPanel.svelte
@@ -29,7 +29,7 @@
             s.booting = res.reboot;
             return s;
         });
-        navigate("/");
+        navigate("/setup");
 	}
 </script>
 
diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
index eb1745c0..0fd3efce 100644
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -1031,8 +1031,7 @@ void AmsWebServer::handleSave() {
 		config->setMeterConfig(*meterConfig);
 		
 		sys.userConfigured = success;
-		//TODO sys.country 
-		sys.dataCollectionConsent = server.hasArg(F("sf")) && server.arg(F("sf")) == F("true") ? 1 : 2;
+		sys.dataCollectionConsent = 0;
 		config->setSystemConfig(sys);
 
 		performRestart = true;