diff --git a/modules/ppcp-onboarding/assets/js/onboarding.js b/modules/ppcp-onboarding/assets/js/onboarding.js
index 3b67c10d6..15d2abc05 100644
--- a/modules/ppcp-onboarding/assets/js/onboarding.js
+++ b/modules/ppcp-onboarding/assets/js/onboarding.js
@@ -173,12 +173,29 @@ const disconnect = (event) => {
 		}
 	);
 
-	document.querySelectorAll('#mainform input[type="checkbox"]').forEach(
-		(checkbox) => {
-			checkbox.addEventListener('click', checkBoxOnClick);
+	// Prevent a possibly dirty form arising from this particular checkbox.
+	sandboxSwitchElement.addEventListener(
+		'click',
+		(event) => {
+			const value = event.target.checked;
+
+			toggleSandboxProduction( ! value );
+
+			event.preventDefault();
+			event.stopPropagation();
+			setTimeout( () => {
+				event.target.checked = value;
+				}, 1
+			);
 		}
 	);
 
+	// document.querySelectorAll('#mainform input[type="checkbox"]').forEach(
+	// 	(checkbox) => {
+	// 		checkbox.addEventListener('click', checkBoxOnClick);
+	// 	}
+	// );
+
 	document.querySelectorAll('#field-sandbox_toggle_manual_input button, #field-production_toggle_manual_input button').forEach(
 		(button) => {
 			button.addEventListener(
@@ -192,4 +209,4 @@ const disconnect = (event) => {
 		}
 	)
 
-})();
\ No newline at end of file
+})();