diff --git a/.gitignore b/.gitignore
index a05346c..81b95e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ docker/bin
 .phpcs.cache
 node_modules/
 .php_cs_fixer.cache
+.aider*
diff --git a/.phpcs.xml b/.phpcs.xml
index 6ee615f..356faf3 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -17,6 +17,8 @@
 	<rule ref="Squiz.Commenting.FunctionComment">
 		<exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop"/>
 		<exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital"/>
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
+		<exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
 		<exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
 	</rule>
diff --git a/prestashop1.7/controllers/admin/AdminTawktoController.php b/prestashop1.7/controllers/admin/AdminTawktoController.php
index e52b218..9f4c007 100644
--- a/prestashop1.7/controllers/admin/AdminTawktoController.php
+++ b/prestashop1.7/controllers/admin/AdminTawktoController.php
@@ -21,11 +21,20 @@
     exit;
 }
 
+/**
+ * Tawkto exception
+ */
+class TawktoException extends Exception
+{
+}
+
 /**
  * Admin settings controller
  */
 class AdminTawktoController extends ModuleAdminController
 {
+    public const NO_CHANGE = 'nochange';
+
     /**
      * __construct
      *
@@ -87,11 +96,15 @@ public function renderView()
         $optKey = TawkTo::TAWKTO_WIDGET_OPTS;
 
         // returns 'false' if retrieved none.
-        $displayOpts = Configuration::get($optKey);
-        if (!$displayOpts) {
-            $displayOpts = null;
+        $widgetOpts = Configuration::get($optKey);
+        if (!$widgetOpts) {
+            $widgetOpts = null;
+        }
+        $widgetOpts = Tools::jsonDecode($widgetOpts);
+
+        if ($widgetOpts && !empty($widgetOpts->js_api_key)) {
+            $widgetOpts->js_api_key = self::NO_CHANGE;
         }
-        $displayOpts = Tools::jsonDecode($displayOpts);
 
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
@@ -113,7 +126,7 @@ public function renderView()
             'controller' => $this->context->link->getAdminLink('AdminTawkto'),
             'tab_id' => (int) $this->context->controller->id,
             'domain' => $domain,
-            'display_opts' => $displayOpts,
+            'widget_opts' => $widgetOpts,
             'page_id' => $pageId,
             'widget_id' => $widgetId,
             'same_user' => $sameUser,
@@ -221,8 +234,54 @@ public function ajaxProcessRemoveWidget()
      *
      * @return void
      */
-    public function ajaxProcessSetVisibility()
+    public function ajaxProcessSetOptions()
+    {
+        $key = TawkTo::TAWKTO_WIDGET_OPTS;
+        $jsonOpts = [];
+
+        try {
+            // Process selected options
+            $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        } catch (Exception $e) {
+            if ($e instanceof TawktoException) {
+                die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            }
+
+            die(json_encode(['success' => false, 'message' => 'An error occurred while saving options']));
+        }
+
+        // Override current options/fallback if not selected
+        $currentOpts = Configuration::get($key);
+        if (!empty($currentOpts)) {
+            $currentOpts = json_decode($currentOpts, true);
+            if (is_array($currentOpts)) {
+                $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            }
+        }
+
+        if (!isset($jsonOpts['config_version'])) {
+            $jsonOpts['config_version'] = 0;
+        } else {
+            ++$jsonOpts['config_version'];
+        }
+
+        Configuration::updateValue($key, json_encode($jsonOpts));
+
+        die(json_encode(['success' => true]));
+    }
+
+    /**
+     * Process options
+     *
+     * @param string $params Selected options
+     *
+     * @return array
+     *
+     * @throws TawktoException Error processing options
+     */
+    private function processSetOptions(string $params): array
     {
+        // default options
         $jsonOpts = [
             'always_display' => false,
 
@@ -239,40 +298,99 @@ public function ajaxProcessSetVisibility()
             'show_oncustom' => json_encode([]),
 
             'enable_visitor_recognition' => false,
+            'js_api_key' => '',
         ];
 
-        $options = Tools::getValue('options');
-        if (!empty($options)) {
-            $options = explode('&', $options);
-            foreach ($options as $post) {
-                [$column, $value] = explode('=', $post);
-                switch ($column) {
-                    case 'hide_oncustom':
-                    case 'show_oncustom':
-                        // replace newlines and returns with comma, and convert to array for
-                        // saving
-                        $value = urldecode($value);
-                        $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
-                        if (!empty($value)) {
-                            $value = explode(',', $value);
-                            $jsonOpts[$column] = json_encode($value);
-                        }
+        if (empty($params)) {
+            return $jsonOpts;
+        }
+
+        parse_str($params, $options);
+        foreach ($options as $column => $value) {
+            switch ($column) {
+                case 'hide_oncustom':
+                case 'show_oncustom':
+                    // replace newlines and returns with comma, and convert to array for saving
+                    $value = urldecode($value);
+                    $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
+                    if (!empty($value)) {
+                        $value = explode(',', $value);
+                        $jsonOpts[$column] = json_encode($value);
+                    }
+                    break;
+
+                case 'show_onfrontpage':
+                case 'show_oncategory':
+                case 'show_onproduct':
+                case 'always_display':
+                case 'enable_visitor_recognition':
+                    $jsonOpts[$column] = ($value == 1);
+                    break;
+
+                case 'js_api_key':
+                    if ($value === self::NO_CHANGE) {
+                        unset($jsonOpts['js_api_key']);
                         break;
+                    }
 
-                    case 'show_onfrontpage':
-                    case 'show_oncategory':
-                    case 'show_onproduct':
-                    case 'always_display':
-                    case 'enable_visitor_recognition':
-                        $jsonOpts[$column] = ($value == 1);
+                    if ($value === '') {
                         break;
-                }
+                    }
+
+                    $value = trim($value);
+
+                    if (strlen($value) !== 40) {
+                        throw new TawktoException('Invalid API key.');
+                    }
+
+                    try {
+                        $jsonOpts['js_api_key'] = $this->encryptData($value);
+                    } catch (Exception $e) {
+                        error_log($e->getMessage());
+
+                        throw new TawktoException('Error saving Javascript API Key.');
+                    }
+
+                    break;
             }
         }
 
-        $key = TawkTo::TAWKTO_WIDGET_OPTS;
-        Configuration::updateValue($key, json_encode($jsonOpts));
+        return $jsonOpts;
+    }
 
-        die(Tools::jsonEncode(['success' => true]));
+    /**
+     * Encrypt data
+     *
+     * @param string $data Data to encrypt
+     *
+     * @return string Encrypted data
+     *
+     * @throws Exception error encrypting data
+     */
+    private function encryptData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        try {
+            $iv = random_bytes(16);
+        } catch (Exception $e) {
+            throw new Exception('Failed to generate IV');
+        }
+
+        $encrypted = openssl_encrypt($data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encrypt data');
+        }
+
+        $encrypted = base64_encode($iv . $encrypted);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encode data');
+        }
+
+        return $encrypted;
     }
 }
diff --git a/prestashop1.7/tawkto.php b/prestashop1.7/tawkto.php
index 6c93e88..555c7dd 100644
--- a/prestashop1.7/tawkto.php
+++ b/prestashop1.7/tawkto.php
@@ -35,6 +35,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
+    public const TAWKTO_VISITOR_SESSION = 'TAWKTO_VISITOR_SESSION';
 
     /**
      * __construct
@@ -110,7 +111,11 @@ public function hookDisplayFooter()
         $widgetId = $current_widget['widget_id'];
 
         $result = Configuration::get(self::TAWKTO_WIDGET_OPTS);
-        $enable_visitor_recognition = true; // default value
+        // default values
+        $enable_visitor_recognition = true;
+        $js_api_key = '';
+        $config_version = 0;
+
         if ($result) {
             $options = json_decode($result);
             $current_page = (string) $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -119,6 +124,14 @@ public function hookDisplayFooter()
                 $enable_visitor_recognition = $options->enable_visitor_recognition;
             }
 
+            if (isset($options->js_api_key)) {
+                $js_api_key = $options->js_api_key;
+            }
+
+            if (isset($options->config_version)) {
+                $config_version = $options->config_version;
+            }
+
             // prepare visibility
             if (false == $options->always_display) {
                 // show on specified urls
@@ -168,19 +181,23 @@ public function hookDisplayFooter()
         }
 
         // add customer details as visitor info
-        $customer_name = null;
-        $customer_email = null;
+        $customer_name = '';
+        $customer_email = '';
+        $hash = null;
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
+
+            $hash = $this->getVisitorHash($customer_email, $js_api_key, $config_version);
         }
 
         $this->context->smarty->assign([
             'widget_id' => $widgetId,
             'page_id' => $pageId,
-            'customer_name' => (!is_null($customer_name)) ? $customer_name : '',
-            'customer_email' => (!is_null($customer_email)) ? $customer_email : '',
+            'customer_name' => $customer_name,
+            'customer_email' => $customer_email,
+            'hash' => $hash,
         ]);
 
         return $this->display(__FILE__, 'widget.tpl');
@@ -283,4 +300,85 @@ private function getArrayFromJson($data)
 
         return $arr;
     }
+
+    /**
+     * Get visitor hash
+     *
+     * @param string $email Visitor email
+     * @param string $js_api_key JS API key
+     * @param int $config_version Config version
+     *
+     * @return string|null
+     */
+    private function getVisitorHash(string $email, string $js_api_key, int $config_version)
+    {
+        if (empty($js_api_key)) {
+            return null;
+        }
+
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
+
+        if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
+            $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
+
+            if (isset($current_session['hash'])
+                && $current_session['email'] === $email
+                && $current_session['config_version'] === $config_version) {
+                return $current_session['hash'];
+            }
+        }
+
+        try {
+            $key = $this->getDecryptedData($js_api_key);
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+
+            return null;
+        }
+
+        $hash = hash_hmac('sha256', $email, $key);
+
+        $_SESSION[self::TAWKTO_VISITOR_SESSION] = [
+            'hash' => $hash,
+            'email' => $email,
+            'config_version' => $config_version,
+        ];
+
+        return $hash;
+    }
+
+    /**
+     * Decrypt data
+     *
+     * @param string $data Data to decrypt
+     *
+     * @return string Decrypted data
+     *
+     * @throws Exception error decrypting data
+     */
+    private function getDecryptedData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        $decoded = base64_decode($data);
+
+        if ($decoded === false) {
+            throw new Exception('Failed to decode data');
+        }
+
+        $iv = substr($decoded, 0, 16);
+        $encrypted_data = substr($decoded, 16);
+
+        $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($decrypted_data === false) {
+            throw new Exception('Failed to decrypt data');
+        }
+
+        return $decrypted_data;
+    }
 }
diff --git a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
index 981ca48..80d1a44 100644
--- a/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop1.7/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -67,6 +67,13 @@
 .tawk-tooltip:hover .tawk-tooltiptext {
   visibility: visible;
 }
+
+.options-alert {
+    width: 50%;
+    float: left;
+    font-weight: bold;
+    display: none;
+}
 </style>
 
 <iframe
@@ -196,7 +203,7 @@
                         <label>
                             <input type="checkbox" name="enable_visitor_recognition"
                                 id="enable_visitor_recognition" value="1"
-                                {if is_null($display_opts) || is_null($display_opts->enable_visitor_recognition) || $display_opts->enable_visitor_recognition}
+                                {if is_null($widget_opts) || is_null($widget_opts->enable_visitor_recognition) || $widget_opts->enable_visitor_recognition}
                                     checked
                                 {/if}
                             />
@@ -204,10 +211,30 @@
                     </div>
                 </div>
             </div>
+            <p class='tawk-notice'>
+                Note: If Secure Mode is enabled on your property, please enter your Javascript API Key to ensure visitor recognition works correctly.
+            </p>
+            <div class="form-group row">
+                <label class="control-label col-lg-3">
+                    <span data-toggle="tooltip" data-html="true"
+                        title=""  data-original-title="Javascript API Key">
+                        Javascript API Key
+                    </span>
+                </label>
+                <div class="col-lg-9">
+                    <div class="radio ">
+                        <label>
+                            <input type="password" name="js_api_key" id="js_api_key"
+                                value="{if !is_null($widget_opts) && $widget_opts->js_api_key}{$widget_opts->js_api_key|escape:'html':'UTF-8'}{/if}"
+                            />
+                        </label>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="panel" id="fieldset_1">
-        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Settings </div>
+        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Options </div>
         <div class="form-wrapper row">
             <div class="form-group row">
                 <label class="control-label col-lg-3" for="always_display">
@@ -221,7 +248,7 @@
                         <label>
                             <input type="checkbox" name="always_display"
                                 id="always_display" value="1"
-                                {if is_null($display_opts) || $display_opts->always_display}
+                                {if is_null($widget_opts) || $widget_opts->always_display}
                                     checked
                                 {/if}
                             />
@@ -239,8 +266,8 @@
                 </label>
                 <div class="col-lg-6 control-label">
                     <label>
-                    {if (!is_null($display_opts) && !empty($display_opts->hide_oncustom)) }
-                        {$whitelist = json_decode($display_opts->hide_oncustom)}
+                    {if (!is_null($widget_opts) && !empty($widget_opts->hide_oncustom)) }
+                        {$whitelist = json_decode($widget_opts->hide_oncustom)}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                     {else}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10"></textarea>
@@ -295,7 +322,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onfrontpage"
                                 id="show_onfrontpage" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onfrontpage}
+                                {if !is_null($widget_opts) && $widget_opts->show_onfrontpage}
                                     checked
                                 {/if}
                             />
@@ -316,7 +343,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_oncategory"
                                 id="show_oncategory" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_oncategory}
+                                {if !is_null($widget_opts) && $widget_opts->show_oncategory}
                                     checked
                                 {/if}
                             />
@@ -337,7 +364,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onproduct"
                                 id="show_onproduct" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onproduct}
+                                {if !is_null($widget_opts) && $widget_opts->show_onproduct}
                                     checked
                                 {/if}
                             />
@@ -356,8 +383,8 @@
                 <div class="col-lg-9">
                     <div class="text">
                         <label>
-                        {if (!is_null($display_opts) && !empty($display_opts->show_oncustom)) }
-                            {$whitelist = json_decode($display_opts->show_oncustom)}
+                        {if (!is_null($widget_opts) && !empty($widget_opts->show_oncustom)) }
+                            {$whitelist = json_decode($widget_opts->show_oncustom)}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                         {else}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10"></textarea>
@@ -400,7 +427,8 @@
             </div>
         </div>
         <div class="panel-footer">
-            <div id="optionsSuccessMessage" style="width: 50%; float: left; background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6; font-weight: bold; display: none;" class="alert alert-success">Successfully set widget options to your site</div>
+            <div id="optionsSuccessMessage" style="background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6;" class="alert alert-success options-alert">Successfully set widget options to your site</div>
+            <div id="optionsFailureMessage" class="alert alert-danger options-alert"></div>
             <button type="submit" value="1" id="module_form_submit_btn" name="submitBlockCategories" class="btn btn-default pull-right">
             <i class="process-icon-save"></i> Save</button>
         </div>
@@ -421,7 +449,7 @@ jQuery(document).ready(function() {
             dataType : 'json',
             data : {
                 controller : 'AdminTawkto',
-                action : 'setVisibility',
+                action : 'setOptions',
                 ajax : true,
                 id_tab : current_id_tab,
                 pageId : $('input[name="page_id"]').val(),
@@ -433,6 +461,7 @@ jQuery(document).ready(function() {
                 if(r.success) {
                     $('#optionsSuccessMessage').toggle().delay(3000).fadeOut();
                 } else {
+                    $('#optionsFailureMessage').text(r.message).toggle().delay(3000).fadeOut();
                 }
             }
         });
diff --git a/prestashop1.7/views/templates/hook/widget.tpl b/prestashop1.7/views/templates/hook/widget.tpl
index b863a0a..ea3d88e 100644
--- a/prestashop1.7/views/templates/hook/widget.tpl
+++ b/prestashop1.7/views/templates/hook/widget.tpl
@@ -22,7 +22,10 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
 {if $customer_email != ''}
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
-        email : "{$customer_email|escape:'javascript':'UTF-8'}"
+        email : "{$customer_email|escape:'javascript':'UTF-8'}",
+        {if $hash != null}
+            , hash : "{$hash}"
+        {/if}
     };
 {/if}
 
diff --git a/prestashop8.x/controllers/admin/AdminTawktoController.php b/prestashop8.x/controllers/admin/AdminTawktoController.php
index c1c3208..48ccdbf 100644
--- a/prestashop8.x/controllers/admin/AdminTawktoController.php
+++ b/prestashop8.x/controllers/admin/AdminTawktoController.php
@@ -20,11 +20,20 @@
     exit;
 }
 
+/**
+ * Tawkto exception
+ */
+class TawktoException extends Exception
+{
+}
+
 /**
  * Admin settings controller
  */
 class AdminTawktoController extends ModuleAdminController
 {
+    public const NO_CHANGE = 'nochange';
+
     /**
      * __construct
      *
@@ -86,11 +95,15 @@ public function renderView()
         $optKey = TawkTo::TAWKTO_WIDGET_OPTS;
 
         // returns 'false' if retrieved none.
-        $displayOpts = Configuration::get($optKey);
-        if (!$displayOpts) {
-            $displayOpts = null;
+        $widgetOpts = Configuration::get($optKey);
+        if (!$widgetOpts) {
+            $widgetOpts = null;
+        }
+        $widgetOpts = json_decode($widgetOpts, false);
+
+        if ($widgetOpts && !empty($widgetOpts->js_api_key)) {
+            $widgetOpts->js_api_key = self::NO_CHANGE;
         }
-        $displayOpts = json_decode($displayOpts);
 
         $sameUser = true; // assuming there is only one admin by default
         $empId = Configuration::get(TawkTo::TAWKTO_WIDGET_USER);
@@ -112,7 +125,7 @@ public function renderView()
             'controller' => $this->context->link->getAdminLink('AdminTawkto'),
             'tab_id' => (int) $this->context->controller->id,
             'domain' => $domain,
-            'display_opts' => $displayOpts,
+            'widget_opts' => $widgetOpts,
             'page_id' => $pageId,
             'widget_id' => $widgetId,
             'same_user' => $sameUser,
@@ -221,8 +234,54 @@ public function ajaxProcessRemoveWidget()
      *
      * @return void
      */
-    public function ajaxProcessSetVisibility()
+    public function ajaxProcessSetOptions()
+    {
+        $key = TawkTo::TAWKTO_WIDGET_OPTS;
+        $jsonOpts = [];
+
+        try {
+            // Process selected options
+            $jsonOpts = $this->processSetOptions(Tools::getValue('options'));
+        } catch (Exception $e) {
+            if ($e instanceof TawktoException) {
+                die(json_encode(['success' => false, 'message' => $e->getMessage()]));
+            }
+
+            die(json_encode(['success' => false, 'message' => 'An error occurred while saving options']));
+        }
+
+        // Override current options/fallback if not selected
+        $currentOpts = Configuration::get($key);
+        if (!empty($currentOpts)) {
+            $currentOpts = json_decode($currentOpts, true);
+            if (is_array($currentOpts)) {
+                $jsonOpts = array_merge($currentOpts, $jsonOpts);
+            }
+        }
+
+        if (!isset($jsonOpts['config_version'])) {
+            $jsonOpts['config_version'] = 0;
+        } else {
+            ++$jsonOpts['config_version'];
+        }
+
+        Configuration::updateValue($key, json_encode($jsonOpts));
+
+        die(json_encode(['success' => true]));
+    }
+
+    /**
+     * Process options
+     *
+     * @param string $params Selected options
+     *
+     * @return array
+     *
+     * @throws TawktoException Error processing options
+     */
+    private function processSetOptions(string $params): array
     {
+        // default options
         $jsonOpts = [
             'always_display' => false,
 
@@ -239,38 +298,99 @@ public function ajaxProcessSetVisibility()
             'show_oncustom' => json_encode([]),
 
             'enable_visitor_recognition' => false,
+            'js_api_key' => '',
         ];
 
-        $options = Tools::getValue('options');
-        if (!empty($options)) {
-            $options = explode('&', $options);
-            foreach ($options as $post) {
-                list($column, $value) = explode('=', $post);
-                switch ($column) {
-                    case 'hide_oncustom':
-                    case 'show_oncustom':
-                        // replace newlines and returns with comma, and convert to array for saving
-                        $value = urldecode($value);
-                        $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
-                        if (!empty($value)) {
-                            $value = explode(',', $value);
-                            $jsonOpts[$column] = json_encode($value);
-                        }
+        if (empty($params)) {
+            return $jsonOpts;
+        }
+
+        parse_str($params, $options);
+        foreach ($options as $column => $value) {
+            switch ($column) {
+                case 'hide_oncustom':
+                case 'show_oncustom':
+                    // replace newlines and returns with comma, and convert to array for saving
+                    $value = urldecode($value);
+                    $value = str_ireplace(["\r\n", "\r", "\n"], ',', $value);
+                    if (!empty($value)) {
+                        $value = explode(',', $value);
+                        $jsonOpts[$column] = json_encode($value);
+                    }
+                    break;
+
+                case 'show_onfrontpage':
+                case 'show_oncategory':
+                case 'show_onproduct':
+                case 'always_display':
+                case 'enable_visitor_recognition':
+                    $jsonOpts[$column] = ($value == 1);
+                    break;
+
+                case 'js_api_key':
+                    if ($value === self::NO_CHANGE) {
+                        unset($jsonOpts['js_api_key']);
                         break;
-                    case 'show_onfrontpage':
-                    case 'show_oncategory':
-                    case 'show_onproduct':
-                    case 'always_display':
-                    case 'enable_visitor_recognition':
-                        $jsonOpts[$column] = ($value == 1);
+                    }
+
+                    if ($value === '') {
                         break;
-                }
+                    }
+
+                    $value = trim($value);
+
+                    if (strlen($value) !== 40) {
+                        throw new TawktoException('Invalid API key.');
+                    }
+
+                    try {
+                        $jsonOpts['js_api_key'] = $this->encryptData($value);
+                    } catch (Exception $e) {
+                        error_log($e->getMessage());
+
+                        throw new TawktoException('Error saving Javascript API Key.');
+                    }
+
+                    break;
             }
         }
 
-        $key = TawkTo::TAWKTO_WIDGET_OPTS;
-        Configuration::updateValue($key, json_encode($jsonOpts));
+        return $jsonOpts;
+    }
 
-        die(json_encode(['success' => true]));
+    /**
+     * Encrypt data
+     *
+     * @param string $data Data to encrypt
+     *
+     * @return string Encrypted data
+     *
+     * @throws Exception Error encrypting data
+     */
+    private function encryptData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        try {
+            $iv = random_bytes(16);
+        } catch (Exception $e) {
+            throw new Exception('Failed to generate IV');
+        }
+
+        $encrypted = openssl_encrypt($data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encrypt data');
+        }
+
+        $encrypted = base64_encode($iv . $encrypted);
+
+        if ($encrypted === false) {
+            throw new Exception('Failed to encode data');
+        }
+
+        return $encrypted;
     }
 }
diff --git a/prestashop8.x/tawkto.php b/prestashop8.x/tawkto.php
index 7f43d53..207803f 100644
--- a/prestashop8.x/tawkto.php
+++ b/prestashop8.x/tawkto.php
@@ -34,6 +34,7 @@ class Tawkto extends Module
     public const TAWKTO_WIDGET_OPTS = 'TAWKTO_WIDGET_OPTS';
     public const TAWKTO_WIDGET_USER = 'TAWKTO_WIDGET_USER';
     public const TAWKTO_SELECTED_WIDGET = 'TAWKTO_SELECTED_WIDGET';
+    public const TAWKTO_VISITOR_SESSION = 'TAWKTO_VISITOR_SESSION';
 
     /**
      * __construct
@@ -109,7 +110,11 @@ public function hookDisplayFooter()
         $widgetId = $current_widget['widget_id'];
 
         $result = Configuration::get(self::TAWKTO_WIDGET_OPTS);
-        $enable_visitor_recognition = true; // default value
+        // default values
+        $enable_visitor_recognition = true;
+        $js_api_key = '';
+        $config_version = 0;
+
         if ($result) {
             $options = json_decode($result);
             $current_page = (string) $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -118,6 +123,14 @@ public function hookDisplayFooter()
                 $enable_visitor_recognition = $options->enable_visitor_recognition;
             }
 
+            if (isset($options->js_api_key)) {
+                $js_api_key = $options->js_api_key;
+            }
+
+            if (isset($options->config_version)) {
+                $config_version = $options->config_version;
+            }
+
             // prepare visibility
             if (false == $options->always_display) {
                 // show on specified urls
@@ -167,19 +180,23 @@ public function hookDisplayFooter()
         }
 
         // add customer details as visitor info
-        $customer_name = null;
-        $customer_email = null;
+        $customer_name = '';
+        $customer_email = '';
+        $hash = null;
         if ($enable_visitor_recognition && !is_null($this->context->customer->id)) {
             $customer = $this->context->customer;
             $customer_name = $customer->firstname . ' ' . $customer->lastname;
             $customer_email = $customer->email;
+
+            $hash = $this->getVisitorHash($customer_email, $js_api_key, $config_version);
         }
 
         $this->context->smarty->assign([
             'widget_id' => $widgetId,
             'page_id' => $pageId,
-            'customer_name' => (!is_null($customer_name)) ? $customer_name : '',
-            'customer_email' => (!is_null($customer_email)) ? $customer_email : '',
+            'customer_name' => $customer_name,
+            'customer_email' => $customer_email,
+            'hash' => $hash,
         ]);
 
         return $this->display(__FILE__, 'widget.tpl');
@@ -281,4 +298,85 @@ private function getArrayFromJson($data)
 
         return $arr;
     }
+
+    /**
+     * Get visitor hash
+     *
+     * @param string $email Visitor email
+     * @param string $js_api_key JS API key
+     * @param int $config_version Config version
+     *
+     * @return string|null
+     */
+    private function getVisitorHash(string $email, string $js_api_key, int $config_version)
+    {
+        if (empty($js_api_key)) {
+            return null;
+        }
+
+        if (session_status() === PHP_SESSION_NONE && !headers_sent()) {
+            session_start();
+        }
+
+        if (isset($_SESSION[self::TAWKTO_VISITOR_SESSION])) {
+            $current_session = $_SESSION[self::TAWKTO_VISITOR_SESSION];
+
+            if (isset($current_session['hash'])
+                && $current_session['email'] === $email
+                && $current_session['config_version'] === $config_version) {
+                return $current_session['hash'];
+            }
+        }
+
+        try {
+            $key = $this->getDecryptedData($js_api_key);
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+
+            return null;
+        }
+
+        $hash = hash_hmac('sha256', $email, $key);
+
+        $_SESSION[self::TAWKTO_VISITOR_SESSION] = [
+            'hash' => $hash,
+            'email' => $email,
+            'config_version' => $config_version,
+        ];
+
+        return $hash;
+    }
+
+    /**
+     * Decrypt data
+     *
+     * @param string $data Data to decrypt
+     *
+     * @return string
+     *
+     * @throws Exception error decrypting data
+     */
+    private function getDecryptedData(string $data)
+    {
+        if (!defined('_COOKIE_KEY_')) {
+            throw new Exception('Cookie key not defined');
+        }
+
+        $decoded = base64_decode($data);
+
+        if ($decoded === false) {
+            throw new Exception('Failed to decode data');
+        }
+
+        $iv = substr($decoded, 0, 16);
+        $encrypted_data = substr($decoded, 16);
+
+        $decrypted_data = openssl_decrypt($encrypted_data, 'AES-256-CBC', _COOKIE_KEY_, 0, $iv);
+
+        if ($decrypted_data === false) {
+            throw new Exception('Failed to decrypt data');
+        }
+
+        return $decrypted_data;
+    }
 }
diff --git a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
index 981ca48..80d1a44 100644
--- a/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
+++ b/prestashop8.x/views/templates/admin/tawkto/helpers/view/view.tpl
@@ -67,6 +67,13 @@
 .tawk-tooltip:hover .tawk-tooltiptext {
   visibility: visible;
 }
+
+.options-alert {
+    width: 50%;
+    float: left;
+    font-weight: bold;
+    display: none;
+}
 </style>
 
 <iframe
@@ -196,7 +203,7 @@
                         <label>
                             <input type="checkbox" name="enable_visitor_recognition"
                                 id="enable_visitor_recognition" value="1"
-                                {if is_null($display_opts) || is_null($display_opts->enable_visitor_recognition) || $display_opts->enable_visitor_recognition}
+                                {if is_null($widget_opts) || is_null($widget_opts->enable_visitor_recognition) || $widget_opts->enable_visitor_recognition}
                                     checked
                                 {/if}
                             />
@@ -204,10 +211,30 @@
                     </div>
                 </div>
             </div>
+            <p class='tawk-notice'>
+                Note: If Secure Mode is enabled on your property, please enter your Javascript API Key to ensure visitor recognition works correctly.
+            </p>
+            <div class="form-group row">
+                <label class="control-label col-lg-3">
+                    <span data-toggle="tooltip" data-html="true"
+                        title=""  data-original-title="Javascript API Key">
+                        Javascript API Key
+                    </span>
+                </label>
+                <div class="col-lg-9">
+                    <div class="radio ">
+                        <label>
+                            <input type="password" name="js_api_key" id="js_api_key"
+                                value="{if !is_null($widget_opts) && $widget_opts->js_api_key}{$widget_opts->js_api_key|escape:'html':'UTF-8'}{/if}"
+                            />
+                        </label>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="panel" id="fieldset_1">
-        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Settings </div>
+        <div class="panel-heading"> <i class="icon-cogs"></i> Visibility Options </div>
         <div class="form-wrapper row">
             <div class="form-group row">
                 <label class="control-label col-lg-3" for="always_display">
@@ -221,7 +248,7 @@
                         <label>
                             <input type="checkbox" name="always_display"
                                 id="always_display" value="1"
-                                {if is_null($display_opts) || $display_opts->always_display}
+                                {if is_null($widget_opts) || $widget_opts->always_display}
                                     checked
                                 {/if}
                             />
@@ -239,8 +266,8 @@
                 </label>
                 <div class="col-lg-6 control-label">
                     <label>
-                    {if (!is_null($display_opts) && !empty($display_opts->hide_oncustom)) }
-                        {$whitelist = json_decode($display_opts->hide_oncustom)}
+                    {if (!is_null($widget_opts) && !empty($widget_opts->hide_oncustom)) }
+                        {$whitelist = json_decode($widget_opts->hide_oncustom)}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                     {else}
                         <textarea class="hide_specific" name="hide_oncustom" id="hide_oncustom" cols="30" rows="10"></textarea>
@@ -295,7 +322,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onfrontpage"
                                 id="show_onfrontpage" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onfrontpage}
+                                {if !is_null($widget_opts) && $widget_opts->show_onfrontpage}
                                     checked
                                 {/if}
                             />
@@ -316,7 +343,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_oncategory"
                                 id="show_oncategory" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_oncategory}
+                                {if !is_null($widget_opts) && $widget_opts->show_oncategory}
                                     checked
                                 {/if}
                             />
@@ -337,7 +364,7 @@
                         <label>
                             <input class="show_specific" type="checkbox" name="show_onproduct"
                                 id="show_onproduct" value="1"
-                                {if !is_null($display_opts) && $display_opts->show_onproduct}
+                                {if !is_null($widget_opts) && $widget_opts->show_onproduct}
                                     checked
                                 {/if}
                             />
@@ -356,8 +383,8 @@
                 <div class="col-lg-9">
                     <div class="text">
                         <label>
-                        {if (!is_null($display_opts) && !empty($display_opts->show_oncustom)) }
-                            {$whitelist = json_decode($display_opts->show_oncustom)}
+                        {if (!is_null($widget_opts) && !empty($widget_opts->show_oncustom)) }
+                            {$whitelist = json_decode($widget_opts->show_oncustom)}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10">{foreach from=$whitelist item=page}{$page|escape:'htmlall':'UTF-8'|cat:"\r\n"}{/foreach}</textarea>
                         {else}
                             <textarea class="show_specific" name="show_oncustom" id="show_oncustom" cols="30" rows="10"></textarea>
@@ -400,7 +427,8 @@
             </div>
         </div>
         <div class="panel-footer">
-            <div id="optionsSuccessMessage" style="width: 50%; float: left; background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6; font-weight: bold; display: none;" class="alert alert-success">Successfully set widget options to your site</div>
+            <div id="optionsSuccessMessage" style="background-color: #dff0d8; color: #3c763d; border-color: #d6e9c6;" class="alert alert-success options-alert">Successfully set widget options to your site</div>
+            <div id="optionsFailureMessage" class="alert alert-danger options-alert"></div>
             <button type="submit" value="1" id="module_form_submit_btn" name="submitBlockCategories" class="btn btn-default pull-right">
             <i class="process-icon-save"></i> Save</button>
         </div>
@@ -421,7 +449,7 @@ jQuery(document).ready(function() {
             dataType : 'json',
             data : {
                 controller : 'AdminTawkto',
-                action : 'setVisibility',
+                action : 'setOptions',
                 ajax : true,
                 id_tab : current_id_tab,
                 pageId : $('input[name="page_id"]').val(),
@@ -433,6 +461,7 @@ jQuery(document).ready(function() {
                 if(r.success) {
                     $('#optionsSuccessMessage').toggle().delay(3000).fadeOut();
                 } else {
+                    $('#optionsFailureMessage').text(r.message).toggle().delay(3000).fadeOut();
                 }
             }
         });
diff --git a/prestashop8.x/views/templates/hook/widget.tpl b/prestashop8.x/views/templates/hook/widget.tpl
index b863a0a..e43dc5f 100644
--- a/prestashop8.x/views/templates/hook/widget.tpl
+++ b/prestashop8.x/views/templates/hook/widget.tpl
@@ -23,6 +23,9 @@ var Tawk_API=Tawk_API||{}, Tawk_LoadStart=new Date();
    Tawk_API.visitor = {
         name  : "{$customer_name|escape:'javascript':'UTF-8'}",
         email : "{$customer_email|escape:'javascript':'UTF-8'}"
+        {if $hash != null}
+            , hash : "{$hash}"
+        {/if}
     };
 {/if}