diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_ca.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_ca.properties
index 71819eb5b82..39400f967ab 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_ca.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_ca.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=El codi ha caducat.
 messageOtp.auth.codeInvalid=Codi no vàlid, si us plau, introduïu-lo de nou.
 messageOtp.auth.codeWithOtl=Introduïu un OTP quan s''hauria d''utilitzar un enllaç.
 
-messageOtp.auth.title=S''ha enviat un OTP (contrasenya d''un sol ús) a
-messageOtp.auth.address=S''ha enviat el codi d''autenticació a
+messageOtp.auth.title=S''ha enviat un OTP (contrasenya d''un sol ús)
+messageOtp.auth.address=S''ha enviat un OTP (contrasenya d''un sol ús) a {0}
 messageOtp.auth.label=Codi
 messageOtp.auth.instructionBoth=Introduïu el codi que us hem enviat al vostre dispositiu mòbil per SMS o correu electrònic.
 messageOtp.auth.instructionSms=Introduïu el codi que us hem enviat al vostre dispositiu mòbil per SMS.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_en.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_en.properties
index 9811b28d59f..1e24d9c12ac 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_en.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_en.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=The code has expired.
 messageOtp.auth.codeInvalid=Invalid code entered, please enter it again.
 messageOtp.auth.codeWithOtl=Enter an OTP when Link should be used instead.
 
-messageOtp.auth.title=OTP (One Time Password) was sent to
-messageOtp.auth.address=Authentication Code was sent to
+messageOtp.auth.title=OTP (One Time Password) was sent
+messageOtp.auth.address=OTP (One Time Password) was sent to {0}
 messageOtp.auth.label=Code
 messageOtp.auth.instructionBoth=Enter the code we sent to to your mobile device via sms or email.
 messageOtp.auth.instructionSms=Enter the code we sent to your mobile device via sms.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_es.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_es.properties
index abab2dbdef2..157cb8b2fd4 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_es.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_es.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=El código ha expirado.
 messageOtp.auth.codeInvalid=Código inválido ingresado, por favor ingréselo nuevamente.
 messageOtp.auth.codeWithOtl=Ingrese un OTP cuando se debe usar el enlace en su lugar.
 
-messageOtp.auth.title=Su OTP (Código de Autenticación) fue enviado a
-messageOtp.auth.address=El código de autenticación fue enviado a
+messageOtp.auth.title=Su OTP (Código de Autenticación) fue enviado
+messageOtp.auth.address=Su OTP (Código de Autenticación) fue enviado a {0}
 messageOtp.auth.label=Código
 messageOtp.auth.instructionBoth=Ingrese el código que le enviamos a su dispositivo móvil por SMS o a su email.
 messageOtp.auth.instructionSms=Ingrese el código que le enviamos a su dispositivo móvil por SMS.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_eu.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_eu.properties
index 2531e4687a9..cbcfcebcf3a 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_eu.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_eu.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=Kodea iraungi da.
 messageOtp.auth.codeInvalid=Sartutako kodea baliogabea da, mesedez sartu berriro.
 messageOtp.auth.codeWithOtl=Sartu OTP bat esteka erabili beharrean.
 
-messageOtp.auth.title=OTP (Erabilera Bakarreko Pasahitza) hona bidali da:
-messageOtp.auth.address=Autentifikazio Kodea hona bidali da:
+messageOtp.auth.title=OTP (Erabilera Bakarreko Pasahitza) hona bidali
+messageOtp.auth.address=OTP (Erabilera Bakarreko Pasahitza) hona bidali da: {0}
 messageOtp.auth.label=Kodea
 messageOtp.auth.instructionBoth=Sartu zure gailu mugikorrera SMS edo posta elektronikoz bidali dizugun kodea.
 messageOtp.auth.instructionSms=Sartu zure gailu mugikorrera SMS bidez bidali dizugun kodea.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_gl.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_gl.properties
index e61c56f2b2c..4536190b8e7 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_gl.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_gl.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=O código expirou.
 messageOtp.auth.codeInvalid=Código introducido inválido, por favor introdúceo de novo.
 messageOtp.auth.codeWithOtl=Introduce un OTP cando deberías usar un enlace en troques.
 
-messageOtp.auth.title=OTP (Contrasinal de Uso Único) foi enviado a
-messageOtp.auth.address=O Código de Autenticación foi enviado a
+messageOtp.auth.title=OTP (Contrasinal de Uso Único) foi enviado
+messageOtp.auth.address=OTP (Contrasinal de Uso Único) foi enviado a {0}
 messageOtp.auth.label=Código
 messageOtp.auth.instructionBoth=Introduce o código que enviamos ao teu dispositivo móbil por sms ou correo electrónico.
 messageOtp.auth.instructionSms=Introduce o código que enviamos ao teu dispositivo móbil por sms.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_tl.properties b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_tl.properties
index 778cea487a9..7703539c01c 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_tl.properties
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/messages/messages_tl.properties
@@ -13,8 +13,8 @@ messageOtp.auth.codeExpired=Ang code ay nag-expire na.
 messageOtp.auth.codeInvalid=Hindi wasto ang code na ipinasok, pakipasok ulit.
 messageOtp.auth.codeWithOtl=Kapag ang Link ay dapat gamitin, ilagay ang OTP sa halip.
 
-messageOtp.auth.title=Ang OTP (One Time Password) ay ipinadala sa
-messageOtp.auth.address=Ang Code para Magpatunay ay ipinadala sa
+messageOtp.auth.title=Ang OTP (One Time Password) ay ipinadala
+messageOtp.auth.address=Ang OTP (One Time Password) ay ipinadala sa {0}
 messageOtp.auth.label=Code
 messageOtp.auth.instructionBoth=Ilagay ang code na ipinadala namin sa iyong mobile device sa pamamagitan ng sms o email.
 messageOtp.auth.instructionSms=Ilagay ang code na ipinadala namin sa iyong mobile device sa pamamagitan ng sms.
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/message-otp.login.ftl b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/message-otp.login.ftl
index a9922602d42..5b2ed3a0265 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/message-otp.login.ftl
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/message-otp.login.ftl
@@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <@layout.registrationLayout displayInfo=true; section>
     <#if section = "header">
             <#if isOtl>
-                ${msg("messageOtp.otl.title")}
+                ${msg("messageOtp.otl.address", address)}
             <#else>
-                ${msg("messageOtp.auth.title")}
+                ${msg("messageOtp.auth.address", address)}
             </#if>
 	<#elseif section = "form">
 		<form
@@ -67,11 +67,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 
             <script>
                 <#if isOtl>
-                    let resendTimerI18n = "${msg("messageOtp.otl.resend.timer")}";
-                    let resendButtonI18n = "${msg("messageOtp.otl.resend.button")}";
+                    let resendTimerI18n = "${msg("messageOtp.otl.resend.timer")?no_esc}";
+                    let resendButtonI18n = "${msg("messageOtp.otl.resend.button")?no_esc}";
                 <#else>
-                    let resendTimerI18n = "${msg("messageOtp.auth.resend.timer")}";
-                    let resendButtonI18n = "${msg("messageOtp.auth.resend.button")}";
+                    let resendTimerI18n = "${msg("messageOtp.auth.resend.timer")?no_esc}";
+                    let resendButtonI18n = "${msg("messageOtp.auth.resend.button")?no_esc}";
                 </#if>
                 let resendTimerTimeout = ${(resendTimer)};;
                 let codeJustSent = "${(codeJustSent?string('true', 'false'))}";
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/reset-message-otp.ftl b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/reset-message-otp.ftl
index 7e957e86bef..84baf6415d1 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/reset-message-otp.ftl
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/reset-message-otp.ftl
@@ -7,9 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 <#import "template.ftl" as layout>
 <@layout.registrationLayout displayInfo=true; section>
 	<#if section = "header">
-		${msg("messageOtp.auth.title", realm.displayName)}
+		<#if isOtl>
+			${msg("messageOtp.otl.address", address)}
+		<#else>
+			${msg("messageOtp.auth.address", address)}
+		</#if>
 	<#elseif section = "show-username">
-		<h1>${msg("messageOtp.auth.codeTitle", realm.displayName)}</h1>
+		<h1>${msg("messageOtp.auth.codeTitle")}</h1>
 	<#elseif section = "form">
 		<form
 			id="kc-message-code-login-form"
diff --git a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/verify-email.ftl b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/verify-email.ftl
index a8a14c2f0f6..cf49968307a 100644
--- a/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/verify-email.ftl
+++ b/packages/keycloak-extensions/message-otp-authenticator/src/main/resources/theme-resources/templates/verify-email.ftl
@@ -7,9 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <#import "template.ftl" as layout>
 <@layout.registrationLayout displayInfo=true; section>
 	<#if section = "header">
-		${msg("messageOtp.auth.title", realm.displayName)}
+		${msg("messageOtp.auth.address", address)}
 	<#elseif section = "show-username">
-		<h1>${msg("messageOtp.auth.title", realm.displayName)}</h1>
+		<h1>${msg("messageOtp.auth.address", address)}</h1>
 	<#elseif section = "form">
 		<form
 			id="kc-message-code-login-form"