diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index bdc78344e..f35040e94 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,7 +4,7 @@
  - fixed: Threads with no posts return the wrong lastReply data.
  - fixed #12339: Upgrade to 7.10 causes metadata values to "disappear" (Dale Trexel)
  - Upgraded TinyMCE to 3.5.6
-
+ - fixed #12362: Thingy default Y/N field overly default
 
 7.10.26
  - fixed: Template diagnostics when called without a session asset.
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 127fc6cfa..a9543b3b3 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1132,7 +1132,8 @@ sub getFormPlugin {
     $param{name} = "field_".$data->{fieldId};
     my $name     = $param{name};
     $name =~ s/\^.*?\;//xgs ; # remove macro's from user input
-    $param{value}     = $data->{value} || $data->{defaultValue};
+    #$param{value}     = $data->{value} || $data->{defaultValue};
+    $param{value}     = $data->{value};
     $param{size}      = $data->{size};
     $param{height}    = $data->{height};
     $param{width}     = $data->{width};
@@ -1174,10 +1175,10 @@ sub getFormPlugin {
 
     if ($data->{fieldType} eq "YesNo") {
         if ($data->{defaultValue} =~ /yes/xi) {
-            $param{value} = 1;
+            $param{defaultValue} = 1;
         }
         elsif ($data->{defaultValue} =~ /no/xi) {
-            $param{value} = 0;
+            $param{defaultValue} = 0;
         }
     }
 
@@ -2881,7 +2882,8 @@ sub editThingData {
                 $fieldValue = $thingData{"field_".$field{fieldId}};
             }
         }
-        $field{value} = $fieldValue || $field{defaultValue};
+        #$field{value} = $fieldValue || $field{defaultValue};
+        $field{value} = $fieldValue;
         my $formElement .= $self->getFormPlugin(\%field,($resetForm eq ""))->toHtml;
         
         my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);