diff --git a/edivorce/apps/core/static/js/signing-filing.js b/edivorce/apps/core/static/js/signing-filing.js
index 5f27403a..279629c0 100644
--- a/edivorce/apps/core/static/js/signing-filing.js
+++ b/edivorce/apps/core/static/js/signing-filing.js
@@ -1,8 +1,6 @@
 $(window).load(function () {
     function setSignSeparatelyDefaults() {
-        $("#sign-in-person-both").prop('checked', false);
-        $("#sign-virtual-both").prop('checked', false);
-        $("#sign-virtual-both").trigger('change');
+        $("#sign-in-person-both").prop('checked', true).trigger('change');
         if ($("input:radio[name='signing_location_you']:checked").length === 0) {
             $("#sign-in-person-you").prop('checked', true).trigger('change');
         }
@@ -12,10 +10,8 @@ $(window).load(function () {
     }
 
     function setSignTogetherDefaults() {
-        $("#sign-in-person-you").prop('checked', false);
-        $("#sign-virtual-you").prop('checked', false).trigger('change');
-        $("#sign-in-person-spouse").prop('checked', false);
-        $("#sign-virtual-spouse").prop('checked', false).trigger('change');
+        $("#sign-in-person-you").prop('checked', true).trigger('change');
+        $("#sign-in-person-spouse").prop('checked', true).trigger('change');
         if ($("input:radio[name='signing_location']:checked").length === 0) {
             $("#sign-in-person-both").prop('checked', true).trigger('change');
         }
@@ -29,7 +25,7 @@ $(window).load(function () {
                 setSignTogetherDefaults();
                 $("#signing-location-together").show();
                 $("#signing-location-separately").hide();
-            } else if ($("#sign-separately").prop('checked')) {
+            } else {
                 setSignSeparatelyDefaults();
                 $("#signing-location-together").hide();
                 $("#signing-location-separately").show();
@@ -44,20 +40,25 @@ $(window).load(function () {
     }
 
     function toggleSignVirtually() {
-        if ($("#sign-virtual-both").prop('checked') || $("#sign-virtual-you").prop('checked') || $("#sign-virtual-spouse").prop('checked')) {
+        var signVirtuallyBoth = $("#sign-virtual-both").prop('checked');
+        var signVirtuallyYou = $("#sign-virtual-you").prop('checked');
+        var signVirtuallySpouse = $("#sign-virtual-spouse").prop('checked');
+        if (signVirtuallyBoth || signVirtuallyYou || signVirtuallySpouse) {
             $("#sign-virtually").show();
         } else {
             $("#sign-virtually").hide();
         }
-        if ($("#sign-virtual-both").prop('checked') || $("#sign-virtual-you").prop('checked')) {
+        if (signVirtuallyBoth || signVirtuallyYou) {
             $("#email-you").show();
         } else {
             $("#email-you").hide();
+            $("#email-you-input").removeClass('error');
         }
-        if ($("#sign-virtual-spouse").prop('checked')) {
+        if (signVirtuallySpouse) {
             $("#email-spouse").show();
         } else {
             $("#email-spouse").hide();
+            $("#email-spouse-input").removeClass('error');
         }
         $('#unfilled-email-alert').hide();
     }
@@ -72,17 +73,6 @@ $(window).load(function () {
         }
     }
 
-    function selectDefaults() {
-        if ($("input:radio[name='how_to_sign']:checked").length === 0) {
-            $("#sign-together").prop('checked', true).trigger('change');
-        }
-        if ($("input:radio[name='how_to_file']:checked").length === 0) {
-            $("#file-online").prop('checked', true).trigger('change');
-        }
-    }
-
-    selectDefaults()
-
     $("#sign-separately, #sign-together, #file-online, #file-in-person").change(toggleSigningLocation);
     $("#sign-virtual-both, " +
         "#sign-in-person-both, " +
@@ -92,6 +82,16 @@ $(window).load(function () {
         "#sign-virtual-spouse").change(toggleSignVirtually);
     $("#file-in-person, #file-online").change(toggleFileInPerson);
 
+    function setDefaults() {
+        if ($("input:radio[name='how_to_sign']:checked").length === 0) {
+            $("#sign-together").prop('checked', true).trigger('change');
+        }
+        if ($("input:radio[name='how_to_file']:checked").length === 0) {
+            $("#file-online").prop('checked', true).trigger('change');
+        }
+    }
+
+    setDefaults()
     toggleSigningLocation();
     toggleSignVirtually();
     toggleFileInPerson();