diff --git a/ecomailemailmarketing/ecomailemailmarketing.php b/ecomailemailmarketing/ecomailemailmarketing.php
index 91c5834..44e5766 100644
--- a/ecomailemailmarketing/ecomailemailmarketing.php
+++ b/ecomailemailmarketing/ecomailemailmarketing.php
@@ -30,7 +30,7 @@ public function __construct()
         $this->module_key = '3c90ebaffe6722aece11c7a66bc18bec';
         $this->name = 'ecomailemailmarketing';
         $this->tab = 'emailing';
-        $this->version = '2.0.17';
+        $this->version = '2.0.18';
         $this->author = 'Ecomail';
         $this->need_instance = 0;
         $this->ps_versions_compliancy = ['min' => '1.7.0.0', 'max' => _PS_VERSION_];
@@ -776,8 +776,8 @@ public function hookDisplayFooter(array $params): string
                 'ECOMAIL_APP_ID' => Configuration::get('ECOMAIL_APP_ID'),
                 'ECOMAIL_FORM_ID' => Configuration::get('ECOMAIL_FORM_ID'),
                 'ECOMAIL_FORM_ACCOUNT' => Configuration::get('ECOMAIL_FORM_ACCOUNT'),
-                'EMAIL' => $this->context->cookie->email ?? 'empty',
-                'PRODUCT_ID' => Tools::getValue('id_product') ?? false,
+                'EMAIL' => $this->context->cookie->email,
+                'PRODUCT_ID' => Tools::getValue('id_product'),
             ]
         );
 
diff --git a/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl b/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl
index 6532d42..7fa9e80 100644
--- a/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl
+++ b/ecomailemailmarketing/views/templates/hook/ecomail_scripts.tpl
@@ -35,16 +35,16 @@
   }(window,document,"script","//d70shl7vidtft.cloudfront.net/ecmtr-2.4.2.js","ecotrack"));
   window.ecotrack('newTracker', 'cf', 'd2dpiwfhf3tz0r.cloudfront.net', { /* Initialise a tracker */  appId: '{$ECOMAIL_APP_ID|escape:'javascript':'UTF-8'}'});
 
-  if ('{$EMAIL|escape:'javascript':'UTF-8'}' !== 'empty'){
+  {if !empty($EMAIL|escape:'javascript':'UTF-8')}
     window.ecotrack('setUserId', '{$EMAIL|escape:'javascript':'UTF-8'}');
-  } else {
+  {else}
     window.ecotrack('setUserIdFromLocation', 'ecmid');
-  }
+  {/if}
   window.ecotrack('trackPageView');
 
-  if ({$PRODUCT_ID|escape:'javascript':'UTF-8'}){
+  {if !empty($PRODUCT_ID|escape:'javascript':'UTF-8')}
     window.ecotrack('trackStructEvent', 'ECM_PRODUCT_VIEW', {$PRODUCT_ID|escape:'javascript':'UTF-8'});
-  }
+  {/if}
 
 </script>
 {* Ecomail stops *}