diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad00be1..940055e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.4] - 2020-10-23
+- Fixed a bug that was causing `lightSwitch` fields to be out of sync [#87](https://github.com/hybridinteractive/craft-contact-form-extensions/issues/87)
+
 ## [1.2.3] - 2020-10-23
 - Added `Subject` to Submissions Detail page. 
 
diff --git a/composer.json b/composer.json
index 466fff8..d75337a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "hybridinteractive/craft-contact-form-extensions",
     "description": "Adds extensions to the Craft CMS contact form plugin.",
     "type": "craft-plugin",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "keywords": [
         "craft",
         "cms",
diff --git a/src/templates/settings.twig b/src/templates/settings.twig
index c14bc94..ee86311 100644
--- a/src/templates/settings.twig
+++ b/src/templates/settings.twig
@@ -33,8 +33,8 @@
         name: 'enableDatabase',
         disabled:     'enableDatabase' in overrides,
         warning:      'enableDatabase' in overrides ? configWarning('enableDatabase'),
-        on: settings.enableDatabase == true })
-    }}
+        on: settings.enableDatabase == true
+    }) }}
 
     {{ forms.lightswitchField({
         label: 'Send confirmation email',
@@ -43,11 +43,11 @@
         name: 'enableConfirmationEmail',
         disabled:     'enableConfirmationEmail' in overrides,
         warning:      'enableConfirmationEmail' in overrides ? configWarning('enableConfirmationEmail'),
-        on: settings.enableConfirmationEmail == true,
+        on: settings.enableConfirmationEmail,
         toggle: "confirmationTemplate"
     }) }}
 
-    <div id="confirmationTemplate" style="margin-bottom: 20px;">
+    <div id="confirmationTemplate" class="hidden" style="margin-bottom: 20px;">
         {{ forms.textField({
             label: 'Set the template for the confirmation email',
             instructions: 'The template will receive a `submission` variable',
@@ -76,11 +76,11 @@
         name: 'enableTemplateOverwrite',
         disabled:     'enableTemplateOverwrite' in overrides,
         warning:      'enableTemplateOverwrite' in overrides ? configWarning('enableTemplateOverwrite'),
-        on: settings.enableTemplateOverwrite == true,
+        on: settings.enableTemplateOverwrite,
         toggle: "templateSettings"
     }) }}
 
-    <div id="templateSettings">
+    <div id="templateSettings" class="hidden">
         {{ forms.textField({
             label: 'Set a template for the notification email',
             instructions: 'The template will receive a `submission` variable',
@@ -206,5 +206,3 @@
         </div>
     </div>
 </div>
-
-