diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index 856571a5b3..be61eedcb2 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -93,7 +93,6 @@
 	$: schema && reorder()
 
 	function reorder() {
-		console.log('reordering')
 		if (schema?.order && Array.isArray(schema.order)) {
 			const n = {}
 
diff --git a/frontend/src/lib/components/SuperadminSettings.svelte b/frontend/src/lib/components/SuperadminSettings.svelte
index 8b381467fb..5a50089ae6 100644
--- a/frontend/src/lib/components/SuperadminSettings.svelte
+++ b/frontend/src/lib/components/SuperadminSettings.svelte
@@ -122,6 +122,7 @@
 															<ToggleButtonGroup
 																selected={super_admin}
 																on:selected={async (e) => {
+																	console.log('BAR')
 																	if (email == $userStore?.email) {
 																		sendUserToast('You cannot demote yourself', true)
 																		listUsers()
diff --git a/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte b/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
index 4380c56493..c45e9710b7 100644
--- a/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
+++ b/frontend/src/lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte
@@ -19,17 +19,19 @@
 	const selectedContent = writable(selected)
 
 	function setSelected(selected: any) {
-		selectedContent.set(selected)
+		if ($selectedContent != selected) {
+			selectedContent.set(selected)
+		}
 	}
 
 	$: setSelected(selected)
 
-	$: dispatch('selected', $selectedContent)
 	setContext<ToggleButtonContext>('ToggleButtonGroup', {
 		selected: selectedContent,
 		select: (value: any) => {
 			selectedContent.set(value)
 			selected = value
+			dispatch('selected', value)
 		}
 	})
 </script>