diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index f8f9d07..70a09d9 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -43,7 +43,11 @@ class  CheckboxViewController: BaseViewController {
         showErrorSwitch
             .publisher(for: .valueChanged)
             .sink { [weak self] sender in
-                self?.checkbox.showError = sender.isOn
+                guard let self else { return }
+                self.checkbox.showError = sender.isOn
+                if self.checkbox.showError != sender.isOn {
+                    self.showErrorSwitch.isOn = self.checkbox.showError
+                }
             }.store(in: &subscribers)
 
         disabledSwitch
@@ -84,6 +88,7 @@ class  CheckboxViewController: BaseViewController {
                                                                           preferredStyle: UIAlertController.Style.alert)
                 alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
                 self?.present(alertController, animated: true)
+                self?.showErrorSwitch.isOn = checkbox.showError
                 print("checkbox selected: \(checkbox.isSelected)")
             }.store(in: &subscribers)
         
diff --git a/VDSSample/ViewControllers/TextEntryFieldViewController.swift b/VDSSample/ViewControllers/TextEntryFieldViewController.swift
index 48ff990..ed87801 100644
--- a/VDSSample/ViewControllers/TextEntryFieldViewController.swift
+++ b/VDSSample/ViewControllers/TextEntryFieldViewController.swift
@@ -67,13 +67,21 @@ class  TextEntryFieldViewController: BaseViewController {
         showErrorSwitch
             .publisher(for: .valueChanged)
             .sink { [weak self] sender in
-                self?.textEntryField.showError = sender.isOn
+                guard let self else { return }
+                self.textEntryField.showError = sender.isOn
+                if self.textEntryField.showError != sender.isOn {
+                    self.showErrorSwitch.isOn = self.textEntryField.showError
+                }
             }.store(in: &subscribers)
         
         showSuccessSwitch
             .publisher(for: .valueChanged)
             .sink { [weak self] sender in
-                self?.textEntryField.showSuccess = sender.isOn
+                guard let self else { return }
+                self.textEntryField.showSuccess = sender.isOn
+                if self.textEntryField.showSuccess != sender.isOn {
+                    self.showSuccessSwitch.isOn = self.textEntryField.showSuccess
+                }
             }.store(in: &subscribers)
 
         disabledSwitch