diff --git a/src/plugins/sib-subscribe-to-rai.js b/src/plugins/sib-subscribe-to-rai.js
index e18baf76676125b85121b46258fc82adb062335f..100673b5502c84303413f30da8b9e4018e2bd356 100644
--- a/src/plugins/sib-subscribe-to-rai.js
+++ b/src/plugins/sib-subscribe-to-rai.js
@@ -1,4 +1,4 @@
-import { store } from 'https://cdn.skypack.dev/@startinblox/core@0.15';
+import { store } from 'https://cdn.skypack.dev/@startinblox/core@0.16';
 
 /**
  * Initialize rai plugin.
diff --git a/src/solid-xmpp-chat.js b/src/solid-xmpp-chat.js
index 8887e7ab131e173794aba07d10221da35c634299..4223762587517dc40d7eb78748a3ae5921b10543 100644
--- a/src/solid-xmpp-chat.js
+++ b/src/solid-xmpp-chat.js
@@ -1,4 +1,4 @@
-import { Sib, store, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.15';
+import { Sib, store, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.16';
 import { Deferred } from './utils.js';
 import ComponentPath from './path.js';
 
@@ -174,6 +174,11 @@ export const SolidXMPPChat = {
 
       const idToken = await document.querySelector('sib-auth').getUserIdToken();
 
+      let lang = this.element.dataset.i18n || 'fr';
+      if (localStorage.getItem('language') || (window.navigator.language !== null && window.navigator.language !== undefined)) {
+        lang = localStorage.getItem('language') || window.navigator.language.slice(0, 2);
+      }
+
       converse.initialize({
         'assets_path': (/skypack/.test(ComponentPath) ? ComponentPath.replace('cdn.skypack.dev', 'unpkg.com') : ComponentPath) + '/dist/conversejs/',
         'authentication': this.element.dataset.authentication || 'login',
@@ -195,7 +200,7 @@ export const SolidXMPPChat = {
         'clear_messages_on_reconnection': false,
         'discover_connection_methods': false,
         'jid': jabberID.toLowerCase(),
-        'i18n': this.element.dataset.i18n || 'fr',
+        'i18n': lang,
         'loglevel': 'fatal',
         'message_archiving': 'always',
         'message_archiving_timeout': 60000,