diff --git a/login/login-otp.ftl b/login/login-otp.ftl
index 395b8c3..392e613 100644
--- a/login/login-otp.ftl
+++ b/login/login-otp.ftl
@@ -1,9 +1,9 @@
 <#import "template.ftl" as layout>
 <@layout.registrationLayout; section>
     <#if section="header">
-    ${msg("loginTitle",(realm.displayName!''))}
+        <h1 class="login-title display-5 mb-3 d-lg-none">OTP Validation</h1>
+        <h1 class="login-title display-3 mb-5 d-none d-lg-block">OTP Validation</h1>
     <#elseif section="form">
-        <h1 class="login-title display-3 mb-5">OTP Validation</h1>
         <form id="kc-otp-login-form" class=""
             action="${url.loginAction}"
             method="post">
diff --git a/login/login.ftl b/login/login.ftl
index 2029303..01e0dd3 100644
--- a/login/login.ftl
+++ b/login/login.ftl
@@ -1,9 +1,9 @@
 <#import "template.ftl" as layout>
 <@layout.registrationLayout displayInfo=social.displayInfo displayWide=(realm.password && social.providers??); section>
     <#if section = "header">
-        ${msg("loginTitle",(realm.displayName!''))}
+        <h1 class="login-title display-5 mb-3 d-lg-none">Login</h1>
+        <h1 class="login-title display-3 mb-5 d-none d-lg-block">Login</h1>
     <#elseif section = "form">
-        <h1 class="login-title display-3 mb-5">Log In</h1>
         <form onsubmit="login.disabled = true; return true;" action="${url.loginAction}" method="post">
             <div class="form-group mb-2">
                 <label for="username">Username</label>
diff --git a/login/template.ftl b/login/template.ftl
index 31b1ae9..e8fcbc9 100644
--- a/login/template.ftl
+++ b/login/template.ftl
@@ -24,6 +24,21 @@
                         <img src="${url.resourcesPath}/images/logo_left.png" alt="logo" class="logo">
                     </div>
                     <div class="login-wrapper my-auto">
+                        <#nested "header">
+
+                        <#-- App-initiated actions should not see warning messages about the need to complete the action -->
+                        <#-- during login.                                                                               -->
+                        <#if displayMessage && message?has_content && (message.type != 'warning' || !isAppInitiatedAction??)>
+                            <#if message.type == 'error'>
+                                <div class="alert alert-danger">
+                            <#else>
+                                <div class="alert alert-${message.type}">
+                            <#endif> 
+                                <span>${kcSanitize(message.summary)?no_esc}</span>
+                            </div>
+                        </#if>
+
+
                         <#nested "form">
                     </div>
                 </div>