diff --git a/extension/Classes/Core/Evaluate.php b/extension/Classes/Core/Evaluate.php
index cd346d84a7b234fd7897f043e5e753a3514ef3aa..86349f265260281b635a2099d024a121c94a30b4 100644
--- a/extension/Classes/Core/Evaluate.php
+++ b/extension/Classes/Core/Evaluate.php
@@ -411,7 +411,7 @@ class Evaluate {
 
         $value = OnString::escape($escapeTypes, $value, $rcFlagWipe);
 
-        if (($foundInStore == '' || $value == '') && $arrToken[VAR_INDEX_DEFAULT] != '') {
+        if (($foundInStore == '' || $value === '') && $arrToken[VAR_INDEX_DEFAULT] != '') {
             $foundInStore = TOKEN_FOUND_AS_DEFAULT;
             $value = str_replace('\\:', ':', $arrToken[VAR_INDEX_DEFAULT]);
         }
diff --git a/extension/Classes/Core/Store/FillStoreForm.php b/extension/Classes/Core/Store/FillStoreForm.php
index 04538b94239cb1fd49a56e0ea0dc1f17568ffd2f..3dc13e177d71b4f370f30d5cfb52a15e13638a6b 100644
--- a/extension/Classes/Core/Store/FillStoreForm.php
+++ b/extension/Classes/Core/Store/FillStoreForm.php
@@ -331,7 +331,7 @@ class FillStoreForm {
 
                     // empty select, radio and checkbox elements used to be 0 for correct handling
                     if(($formElement[FE_TYPE] === FE_TYPE_SELECT || $formElement[FE_TYPE] === FE_TYPE_RADIO || $formElement[FE_TYPE] === FE_TYPE_CHECKBOX) && $val == '') {
-                        $newValues[$formElement[FE_NAME]] = '0';
+                        $newValues[$formElement[FE_NAME]] = 0;
                     }
                 }
             }