diff --git a/assets/js/components/Config/SiteSettings.vue b/assets/js/components/Config/SiteSettings.vue
index 668c1ca62..c5fa21d29 100644
--- a/assets/js/components/Config/SiteSettings.vue
+++ b/assets/js/components/Config/SiteSettings.vue
@@ -9,7 +9,7 @@
 					placeholder="Home"
 				/>
 			</FormRow>
-			<FormRow id="adminPassword" label="Admin password">
+			<FormRow id="adminPassword" label="Admin password" class="wip">
 				<input
 					id="adminPassword"
 					type="password"
@@ -18,7 +18,7 @@
 					disabled
 				/>
 			</FormRow>
-			<FormRow id="sponsorToken" label="Sponsor token">
+			<FormRow id="sponsorToken" label="Sponsor token" class="wip">
 				<textarea id="sponsorToken" class="form-control" rows="3" disabled value="tba" />
 			</FormRow>
 			<div class="my-4 d-flex justify-content-end">
@@ -117,4 +117,8 @@ export default {
 .group:focus-within {
 	box-shadow: 0 0 1rem 0 var(--evcc-gray-50);
 }
+
+.wip {
+	opacity: 0.2;
+}
 </style>
diff --git a/assets/js/i18n.js b/assets/js/i18n.js
index 2b89ed933..7680a21ca 100644
--- a/assets/js/i18n.js
+++ b/assets/js/i18n.js
@@ -35,7 +35,8 @@ export const LOCALES = {
 };
 
 export const DEFAULT_LOCALE = "en";
-const DEFAULT_BROWSER_LOCALE = document.querySelector("html").getAttribute("lang");
+const htmlLang = document.querySelector("html").getAttribute("lang");
+const DEFAULT_BROWSER_LOCALE = htmlLang.length == 2 ? htmlLang : DEFAULT_LOCALE;
 
 export function getLocalePreference() {
   return settings.locale;
diff --git a/assets/js/views/Config.vue b/assets/js/views/Config.vue
index 7dd576a67..e31057331 100644
--- a/assets/js/views/Config.vue
+++ b/assets/js/views/Config.vue
@@ -87,9 +87,9 @@
 					<AddDeviceButton :title="$t('config.main.addPvBattery')" @add="addMeter" />
 				</ul>
 
-				<h2 class="my-4">Tariffs</h2>
+				<h2 class="my-4 wip">Tariffs</h2>
 
-				<ul class="p-0 config-list">
+				<ul class="p-0 config-list wip">
 					<DeviceCard
 						name="Grid"
 						unconfigured
@@ -122,9 +122,9 @@
 					</DeviceCard>
 				</ul>
 
-				<h2 class="my-4">Charge Points</h2>
+				<h2 class="my-4 wip">Charge Points</h2>
 
-				<ul class="p-0 config-list">
+				<ul class="p-0 config-list wip">
 					<DeviceCard
 						name="Fake Carport"
 						editable
@@ -170,9 +170,9 @@
 						/>
 					</ul>
 				</div>
-				<h2 class="my-4">Integrations</h2>
+				<h2 class="my-4 wip">Integrations</h2>
 
-				<ul class="p-0 config-list">
+				<ul class="p-0 config-list wip">
 					<DeviceCard name="MQTT" unconfigured data-testid="mqtt" @configure="todo">
 						<template #icon>
 							<shopicon-regular-fastdelivery1></shopicon-regular-fastdelivery1>
@@ -461,4 +461,7 @@ export default {
 	max-width: 900px;
 	margin: 0 auto;
 }
+.wip {
+	opacity: 0.2 !important;
+}
 </style>