diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..e1818d46
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev
diff --git a/psgdpr.php b/psgdpr.php
index d20cc8a1..3b850e7d 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -119,7 +119,7 @@ public function __construct()
         // Settings
         $this->name = 'psgdpr';
         $this->tab = 'administration';
-        $this->version = '1.2.0';
+        $this->version = '1.2.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 
diff --git a/views/js/overrideAddress.js b/views/js/overrideAddress.js
index 5472296d..2e8fe914 100755
--- a/views/js/overrideAddress.js
+++ b/views/js/overrideAddress.js
@@ -17,14 +17,16 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-$(window).load(function() {
-    let addressShipping = $('#addressShipping');
-    addressShipping.empty();
-    addressShipping.append('<p>'+psgdprNoAddresses+'</p>');
-    addressShipping.css("visibility", "visible");
-
-    let addressInvoice = $('#addressInvoice');
-    addressInvoice.empty();
-    addressInvoice.append('<p>'+psgdprNoAddresses+'</p>');
-    addressInvoice.css("visibility", "visible");
+document.addEventListener('DOMContentLoaded', function() {
+    let addressShipping = document.getElementById('addressShipping');
+    if (addressShipping) {
+        addressShipping.innerHTML = '<p>'+psgdprNoAddresses+'</p>';
+        addressShipping.style.visibility = "visible";
+    }
+    
+    let addressInvoice = document.getElementById('addressInvoice');
+    if (addressInvoice) {
+        addressInvoice.innerHTML = '<p>'+psgdprNoAddresses+'</p>';
+        addressInvoice.style.visibility = "visible";
+    }
 });