diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js
index f5b5ab718c3dbfce64c932754b5c59ebc3bc5520..60c3b1612748f004d1fd3946942f2fa28c4da372 100644
--- a/packages/auth/src/auth-keycloak.js
+++ b/packages/auth/src/auth-keycloak.js
@@ -20,7 +20,6 @@ import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
 export class AuthKeycloak extends AdapterLitElement {
     constructor() {
         super();
-        this.lang = 'de';
         this.forceLogin = false;
         this.loadPerson = false;
         this.token = "";
@@ -33,6 +32,7 @@ export class AuthKeycloak extends AdapterLitElement {
         this._loginStatus = LoginStatus.UNKNOWN;
         this.requestedLoginStatus = LoginStatus.UNKNOWN;
         this._i18n = createInstance();
+        this.lang = this._i18n.language;
 
         // Keycloak config
         this.keycloakUrl = null;
diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js
index 3b9170f60a77d3f063294497aea8d778bfe6014f..93aa4627427de5d07025f81ec9ab0b8e1b7371b7 100644
--- a/packages/auth/src/dbp-auth-demo.js
+++ b/packages/auth/src/dbp-auth-demo.js
@@ -10,11 +10,11 @@ import DBPLitElement from "@dbp-toolkit/common/dbp-lit-element";
 export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
     constructor() {
         super();
-        this.lang = 'de';
         this.entryPointUrl = '';
         this.auth = {};
         this.noAuth = false;
         this._i18n = createInstance();
+        this.lang = this._i18n.language;
     }
 
     static get scopedElements() {
diff --git a/packages/auth/src/login-button.js b/packages/auth/src/login-button.js
index 63e7353d567094b24cb376bc7a76da93557a97da..55423562cbfb9275273f06811b789d824121889e 100644
--- a/packages/auth/src/login-button.js
+++ b/packages/auth/src/login-button.js
@@ -55,8 +55,8 @@ export class LoginButton extends ScopedElementsMixin(AdapterLitElement) {
 
     constructor() {
         super();
-        this.lang = 'de';
         this._i18n = createInstance();
+        this.lang = this._i18n.language;
         this.auth = {};
     }
 
diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index f2ed817d4a7a974001c94afcdf20e9424a4472e0..992b6148f629c71e398f23be0d4982f816a0f2ac 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -25,7 +25,6 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
     constructor() {
         super();
         Object.assign(CheckInPlaceSelect.prototype, errorUtils.errorMixin);
-        this.lang = 'de';
         this.entryPointUrl = '';
         this.jsonld = null;
         this.$select = null;
@@ -42,6 +41,7 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
         this.showCapacity = false;
         this.auth = {};
         this._i18n = createInstance();
+        this.lang = this._i18n.language;
 
         this._onDocumentClicked = this._onDocumentClicked.bind(this);
     }
diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
index d77e85619122d1d1a74b5cca5c94c7f281b3b615..b56c85ab68a97bf534d7bc6c916ce0bcb922a7d1 100644
--- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
@@ -5,11 +5,14 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import DBPLitElement from "@dbp-toolkit/common/dbp-lit-element";
+import {createInstance} from './i18n.js';
+
 
 export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
     constructor() {
         super();
-        this.lang = 'de';
+        this._i18n = createInstance();
+        this.lang = this._i18n.language;
         this.entryPointUrl = '';
         this.noAuth = false;
     }