diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index db9ef755..4b41fc26 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -155,7 +155,7 @@ Switch {
     function handleSwitch(event) {
         if (!event.isAutoRepeat) {
             root.checked = !root.checked
-            root.checkedChanged()
+            root.toggled()
         }
         event.accepted = true
     }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index d2db90b0..dcc02860 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -153,7 +153,7 @@ PageType {
                 text: qsTr("Auto-negotiate encryption")
                 checked: autoNegotiateEncryprion
 
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== autoNegotiateEncryprion) {
                         autoNegotiateEncryprion = checked
                     }
@@ -320,7 +320,7 @@ PageType {
 
                 text: qsTr("Additional client configuration commands")
 
-                onCheckedChanged: {
+                onToggled: function() {
                     if (!checked) {
                         additionalClientCommands = ""
                     }
@@ -357,7 +357,7 @@ PageType {
 
                 text: qsTr("Additional server configuration commands")
 
-                onCheckedChanged: {
+                onToggled: function() {
                     if (!checked) {
                         additionalServerCommands = ""
                     }
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 9718f819..bd00be22 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -66,7 +66,7 @@ PageType {
                 text: qsTr("Allow application screenshots")
 
                 checked: SettingsController.isScreenshotsEnabled()
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isScreenshotsEnabled()) {
                         SettingsController.toggleScreenshotsEnabled(checked)
                     }
@@ -109,7 +109,7 @@ PageType {
                 descriptionText: qsTr("Launch the application every time the device is starts")
 
                 checked: SettingsController.isAutoStartEnabled()
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isAutoStartEnabled()) {
                         SettingsController.toggleAutoStart(checked)
                     }
@@ -132,7 +132,7 @@ PageType {
                 descriptionText: qsTr("Connect to VPN on app start")
 
                 checked: SettingsController.isAutoConnectEnabled()
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isAutoConnectEnabled()) {
                         SettingsController.toggleAutoConnect(checked)
                     }
@@ -158,7 +158,7 @@ PageType {
                 opacity: enabled ? 1.0 : 0.5
 
                 checked: SettingsController.isStartMinimizedEnabled()
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isStartMinimizedEnabled()) {
                         SettingsController.toggleStartMinimized(checked)
                     }
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 60323629..59e56095 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -66,7 +66,7 @@ PageType {
                 descriptionText: qsTr("If AmneziaDNS is installed on the server")
 
                 checked: SettingsController.isAmneziaDnsEnabled()
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isAmneziaDnsEnabled()) {
                         SettingsController.toggleAmneziaDns(checked)
                     }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 1359ecdf..89cb41d9 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -64,7 +64,7 @@ PageType {
 
                 checked: SettingsController.isLoggingEnabled
                 
-                onCheckedChanged: {
+                onToggled: function() {
                     if (checked !== SettingsController.isLoggingEnabled) {
                         SettingsController.isLoggingEnabled = checked
                     }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index f88745d4..3410842d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -86,7 +86,7 @@ PageType {
 
                             visible: PageController.isStartPageVisible()
                             checked: SettingsController.isLoggingEnabled
-                            onCheckedChanged: {
+                            onToggled: function() {
                                 if (checked !== SettingsController.isLoggingEnabled) {
                                     SettingsController.isLoggingEnabled = checked
                                 }