diff --git a/web_switch_context_warning/__manifest__.py b/web_switch_context_warning/__manifest__.py
index 90f8f6b22..32e14d4b2 100644
--- a/web_switch_context_warning/__manifest__.py
+++ b/web_switch_context_warning/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Switch Context Warning",
     "summary": "Show a warning if current user, company or database "
     "have been switched in another tab or window.",
-    "version": "12.0.2.0.0",
+    "version": "13.0.1.0.0",
     "category": "web",
     "website": "https://github.com/OCA/web",
     "license": "AGPL-3",
diff --git a/web_switch_context_warning/readme/CONTRIBUTORS.rst b/web_switch_context_warning/readme/CONTRIBUTORS.rst
index 0e095736e..0c028f51b 100644
--- a/web_switch_context_warning/readme/CONTRIBUTORS.rst
+++ b/web_switch_context_warning/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
 * Hparfr <https://github.com/hparfr>
-* Adria Gil Sorribes <adria.gil@eficent.com>
+* Adria Gil Sorribes <adria.gil@forgeflow.com>
diff --git a/web_switch_context_warning/readme/DESCRIPTION.rst b/web_switch_context_warning/readme/DESCRIPTION.rst
index 166b67eb3..c9d47d7b6 100644
--- a/web_switch_context_warning/readme/DESCRIPTION.rst
+++ b/web_switch_context_warning/readme/DESCRIPTION.rst
@@ -1 +1 @@
-Shows a warning if current user, company or database have been switched in another tab or window.
+Shows a warning if current user or database have been switched in another tab or window.
diff --git a/web_switch_context_warning/readme/ROADMAP.rst b/web_switch_context_warning/readme/ROADMAP.rst
index 7a5a6531b..d3b5cc0de 100644
--- a/web_switch_context_warning/readme/ROADMAP.rst
+++ b/web_switch_context_warning/readme/ROADMAP.rst
@@ -1,3 +1,3 @@
     * If the browser don't implement Shared Worker (http://www.w3.org/TR/workers/#sharedworker), the warning message will not be displayed (there is no polyfill).
 
-    * Switching company in a separate browser or in private browsing mode will not be detected by this module. It's a limitation of Shared Worker(limit to browser session, server:port...)
+    * Switching user or database in a separate browser or in private browsing mode will not be detected by this module. It's a limitation of Shared Worker(limit to browser session, server:port...)
diff --git a/web_switch_context_warning/static/src/js/switch_context_warning.js b/web_switch_context_warning/static/src/js/switch_context_warning.js
index 7f9ad6392..3615013e3 100644
--- a/web_switch_context_warning/static/src/js/switch_context_warning.js
+++ b/web_switch_context_warning/static/src/js/switch_context_warning.js
@@ -11,7 +11,7 @@ odoo.define("web_switch_context_warning.widget", function(require) {
         // Not supported
         return;
     }
-    var SwitchCompanyWarningWidget = Widget.extend({
+    var SwitchContextWarningWidget = Widget.extend({
         template: "web_switch_context_warning.warningWidget",
         init: function() {
             this._super();
@@ -33,17 +33,17 @@ odoo.define("web_switch_context_warning.widget", function(require) {
             w.port.postMessage(this.generateSignature());
         },
         generateSignature: function() {
-            return [session.uid, session.company_id, session.db].join();
+            return [session.uid, session.db].join();
         },
     });
 
     UserMenu.include({
         init: function(parent) {
             this._super(parent);
-            var switchCompanyWarning = new SwitchCompanyWarningWidget();
-            switchCompanyWarning.insertAfter(".o_main_navbar");
+            var switchContextWarning = new SwitchContextWarningWidget();
+            switchContextWarning.insertAfter(".o_main_navbar");
         },
     });
 
-    return SwitchCompanyWarningWidget;
+    return SwitchContextWarningWidget;
 });
diff --git a/web_switch_context_warning/static/src/xml/switch_context_warning.xml b/web_switch_context_warning/static/src/xml/switch_context_warning.xml
index b134d0556..bca952dfb 100644
--- a/web_switch_context_warning/static/src/xml/switch_context_warning.xml
+++ b/web_switch_context_warning/static/src/xml/switch_context_warning.xml
@@ -6,7 +6,7 @@
             style="text-align: center; display:none;padding-top:20px;padding-bottom:5px"
         >
             <h3
-            >You switched to a different user, company or database with another tab or window</h3>
+            >You switched to a different user or database with another tab or window</h3>
             <p><button
                     onclick="location.reload(true);"
                     class="btn"