diff --git a/src/main/kotlin/id/walt/db/models/WalletOperationHistories.kt b/src/main/kotlin/id/walt/db/models/WalletOperationHistories.kt
index 4be7d16..d7beb1a 100644
--- a/src/main/kotlin/id/walt/db/models/WalletOperationHistories.kt
+++ b/src/main/kotlin/id/walt/db/models/WalletOperationHistories.kt
@@ -1,12 +1,14 @@
 package id.walt.db.models
 
+import id.walt.crypto.utils.JsonUtils.toJsonObject
 import id.walt.service.WalletService
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.datetime.toKotlinInstant
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 import kotlinx.uuid.UUID
 import kotlinx.uuid.exposed.KotlinxUUIDTable
 import kotlinx.uuid.generateUUID
@@ -28,7 +30,7 @@ data class WalletOperationHistory(
     val wallet: UUID,
     val timestamp: Instant,
     val operation: String,
-    val data: String,
+    val data: JsonObject,
 ) {
     constructor(result: ResultRow) : this(
         id = result[WalletOperationHistories.id].value,
@@ -36,7 +38,7 @@ data class WalletOperationHistory(
         wallet = result[WalletOperationHistories.wallet].value,
         timestamp = result[WalletOperationHistories.timestamp].toKotlinInstant(),
         operation = result[WalletOperationHistories.operation],
-        data = result[WalletOperationHistories.data],
+        data = Json.parseToJsonElement(result[WalletOperationHistories.data]).jsonObject,
     )
 
     companion object {
@@ -45,7 +47,7 @@ data class WalletOperationHistory(
             wallet = wallet.walletId,
             timestamp = Clock.System.now(),
             operation = operation,
-            data = Json.encodeToString(data)
+            data = data.toJsonObject()
         )
     }
 }
diff --git a/src/main/kotlin/id/walt/service/WalletServiceManager.kt b/src/main/kotlin/id/walt/service/WalletServiceManager.kt
index fa9b98c..34d60ca 100644
--- a/src/main/kotlin/id/walt/service/WalletServiceManager.kt
+++ b/src/main/kotlin/id/walt/service/WalletServiceManager.kt
@@ -26,6 +26,21 @@ object WalletServiceManager {
     fun createWallet(forAccount: UUID): UUID {
         val accountName = AccountsService.getNameFor(forAccount)
 
+        // TODO: remove testing code / lock behind dev-mode
+        if (accountName?.contains("multi-wallet") == true) {
+            val second = Wallets.insert {
+                it[name] = "ABC Company wallet"
+                it[createdOn] = Clock.System.now().toJavaInstant()
+            }[Wallets.id].value
+
+            AccountWalletMappings.insert {
+                it[account] = forAccount
+                it[wallet] = second
+                it[permissions] = AccountWalletPermissions.READ_ONLY
+                it[addedOn] = Clock.System.now().toJavaInstant()
+            }
+        }
+
         val walletId = Wallets.insert {
             it[name] = "Wallet of $accountName"
             it[createdOn] = Clock.System.now().toJavaInstant()
diff --git a/web/nuxt.config.ts b/web/nuxt.config.ts
index 1e5ac09..a7a5bda 100644
--- a/web/nuxt.config.ts
+++ b/web/nuxt.config.ts
@@ -176,7 +176,7 @@ export default defineNuxtConfig({
     runtimeConfig: {
         public: {
             projectId: process.env.ProjectId,
-            issuerCallbackUrl: process.env.IssuerCallbackUrl ?? "http://localhost:3000"
+            issuerCallbackUrl: process.env.IssuerCallbackUrl ?? "http://localhost:3000",
         }
     },
 
diff --git a/web/src/app.config.ts b/web/src/app.config.ts
new file mode 100644
index 0000000..36a33e1
--- /dev/null
+++ b/web/src/app.config.ts
@@ -0,0 +1,10 @@
+export default defineAppConfig({
+    enableCloudTenants: false,
+    localTenant: {
+        name : "walt.id GmbH",
+        logoImage : "/svg/waltid.svg",
+        inWalletLogoImage : "/svg/walt-s.svg",
+        bgImage : "/images/start-page-background.png",
+        showWaltidLoadingSpinner : true,
+    }
+})
diff --git a/web/src/app.vue b/web/src/app.vue
index 3881f38..4f4a7ba 100644
--- a/web/src/app.vue
+++ b/web/src/app.vue
@@ -29,10 +29,8 @@ InitApp();
 const locale = useState<string>("locale.i18n");
 
 const tenant = await (useTenant()).value
-const bgImg = tenant?.bgImg
 const name = tenant?.name
 const logoImg = tenant?.logoImage
-const showWaltidLoadingSpinner = tenant?.showWaltidLoadingSpinner
 </script>
 
 <style lang="postcss">
diff --git a/web/src/composables/tenants.ts b/web/src/composables/tenants.ts
index bbfec03..5680729 100644
--- a/web/src/composables/tenants.ts
+++ b/web/src/composables/tenants.ts
@@ -1,20 +1,35 @@
 export function useTenant() {
     return useState("tenant-config", async () => {
-        const baseTenantDomain = useRequestURL().host.replace(":3000", ":8080");
-        console.log("Base tenant domain is: ", baseTenantDomain)
+        console.log("Getting tenant config...");
+        const config = useAppConfig();
+        console.log("App config: ", config);
 
-        const { data , error } = await useFetch("http://" + baseTenantDomain + "/config/wallet");
-        console.log("Tenant configuration: ", data.value)
+        if (config.enableCloudTenants) {
+            const baseTenantDomain = useRequestURL().host.replace(":3000", ":8080");
+            console.log("Base tenant domain is: ", baseTenantDomain);
 
-        if (error.value) {
-            console.log("Tenant error: ", error.value.message)
-            throw createError({
-                statusCode: 404,
-                statusMessage: "Tenant error: " + error.value?.data?.message,
-                fatal: true
-            })
-        }
+            const { data, error } = await useFetch("http://" + baseTenantDomain + "/config/wallet");
+            console.log("Tenant configuration: ", data.value);
+
+            if (error.value) {
+                const dataMessage = error.value?.data?.message;
+                const localErrorMessage = error.value?.message;
+
+                console.log("Tenant error, error message: ", dataMessage);
+                console.log("Tenant error, data message: ", dataMessage);
 
-        return data.value;
+                const errorMessage = dataMessage ? dataMessage : localErrorMessage;
+
+                throw createError({
+                    statusCode: 404,
+                    statusMessage: "Tenant error: " + errorMessage,
+                    fatal: true
+                });
+            }
+
+            return data.value;
+        } else {
+            return config.localTenant;
+        }
     });
 }
diff --git a/web/src/pages/login.vue b/web/src/pages/login.vue
index 2c744df..04a42b1 100644
--- a/web/src/pages/login.vue
+++ b/web/src/pages/login.vue
@@ -4,7 +4,8 @@
             <div class="mx-auto w-full max-w-sm lg:w-96 p-3 lg:backdrop-blur-md lg:rounded-3xl lg:shadow lg:bg-neutral-100 lg:bg-opacity-40">
                 <div class="">
                     <img alt="walt.id logo" class="h-24 lg:h-16 w-auto mx-auto mt-2" :src="logoImg" />
-                    <h2 class="mt-4 text-3xl font-bold tracking-tight text-gray-800">Sign in to your SSI wallet</h2>
+                    <h2 v-if="name?.includes('NEOM')" class="mt-4 text-3xl font-bold tracking-tight text-gray-800 text-center" style="direction: rtl;">تسجيل الدخول إلى محفظة SSI</h2> <!-- TODO: i18n system -->
+                    <h2 v-else class="mt-4 text-3xl font-bold tracking-tight text-gray-800">Sign in to your SSI wallet</h2>
                     <p class="mt-2 text-sm text-gray-600">
                         Or {{ " " }}
                         <NuxtLink class="font-medium text-blue-600 hover:text-blue-500" to="/signup">sign up for your SSI wallet</NuxtLink>!
diff --git a/web/src/pages/signup.vue b/web/src/pages/signup.vue
index 262aa48..b31777e 100644
--- a/web/src/pages/signup.vue
+++ b/web/src/pages/signup.vue
@@ -219,7 +219,7 @@ function validatePassword(): boolean {
 }
 
 definePageMeta({
-    title: "register to your wallet - walt.id",
+    title: "Register for your wallet - walt.id",
     layout: "minimal",
     auth: {
         unauthenticatedOnly: true,
@@ -228,7 +228,7 @@ definePageMeta({
 });
 
 useHead({
-    title: "register to your wallet - walt.id",
+    title: "Register for your wallet - walt.id",
 });
 </script>
 
diff --git a/web/src/pages/wallet/[wallet]/exchange/presentation.vue b/web/src/pages/wallet/[wallet]/exchange/presentation.vue
index 01c42f0..6ad4a0b 100644
--- a/web/src/pages/wallet/[wallet]/exchange/presentation.vue
+++ b/web/src/pages/wallet/[wallet]/exchange/presentation.vue
@@ -118,7 +118,7 @@
 
             <Disclosure>
                 <DisclosureButton class="py-2">
-                    <ButtonsWaltButton class="bg-gray-50 text-black">View presentation definition JSON</ButtonsWaltButton>
+                    <ButtonsWaltButton class="bg-gray-400 text-white">View presentation definition JSON</ButtonsWaltButton>
                 </DisclosureButton>
                 <DisclosurePanel class="text-gray-500 overflow-x-scroll pb-2">
                     <pre>{{ presentationDefinition }}</pre>
diff --git a/web/src/pages/history.vue b/web/src/pages/wallet/[wallet]/history.vue
similarity index 100%
rename from web/src/pages/history.vue
rename to web/src/pages/wallet/[wallet]/history.vue