diff --git a/ansible/artifacts/sunbird/login/login-update-password.ftl b/ansible/artifacts/sunbird/login/login-update-password.ftl
index 6bb0167c030a60a3d4c13bbc6dde83b0c71661a1..269d5e10caa7d621001f66d8fb1bcc911fadd030 100644
--- a/ansible/artifacts/sunbird/login/login-update-password.ftl
+++ b/ansible/artifacts/sunbird/login/login-update-password.ftl
@@ -26,7 +26,7 @@
                         </label>
                         <div class="ui search">
                             <div class="ui mt-8 icon input">
-                                <input class="" type="password" id="password-new" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password-new" autocomplete="off" onkeydown="javascript:validatePassword()"/>    
+                                <input class="" type="password" id="password-new" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password-new" autocomplete="new-password" onkeydown="javascript:validatePassword()"/>    
                                 <i class="eye icon link" onclick="viewPassword(this)"></i>
                                 <!--i id="preview-hide" class="eye slash icon hide link"></i-->
                             </div>
@@ -40,7 +40,7 @@
                         <label id="password-confirmLabelPlaceholder" class="activeLabelColor hide" for="password-confirm">
                             ${msg("passwordConfirm")}
                         </label>
-                        <input type="password" class="mt-8" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" id="password-confirm" name="password-confirm" autocomplete="off" onkeydown="javascript:matchPassword()"/>
+                        <input type="password" class="mt-8" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" id="password-confirm" name="password-confirm" autocomplete="new-password" onkeydown="javascript:matchPassword()"/>
                         <div id="passwd-match-error-msg" class="ui text confpasswderr hide">Passwords do not match</div>
                     </div>
                     <div class="field">
diff --git a/ansible/artifacts/sunbird/login/login.ftl b/ansible/artifacts/sunbird/login/login.ftl
index 61963c09fc89d23cd1ccea6c044e14f357e0cc1b..793b426680d9d8a94f882b58fa40905389bdfaab 100644
--- a/ansible/artifacts/sunbird/login/login.ftl
+++ b/ansible/artifacts/sunbird/login/login.ftl
@@ -41,7 +41,7 @@
                          <#-- TODO: need to find alternative for prepopulating username -->
                         <input class="mt-8" id="username" name="username" placeholder="Enter your email / mobile number" type="text" disabled />
                         <#else>
-                        <input class="mt-8" id="username" name="username" placeholder="Enter your email / mobile number" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" type="text" autofocus autocomplete="off" />
+                        <input class="mt-8" id="username" name="username" placeholder="Enter your email / mobile number" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" type="text" autofocus autocomplete="username" />
                         </#if>
                     </div>
                     <div class="field mb-8">
@@ -54,7 +54,7 @@
                                 ${msg("placeholderForPassword")}
                             </label>
                         </div>
-                        <input placeholder="${msg('passwordPlaceholder')}" class=" mt-8" id="password" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password" type="password" autocomplete="off" />
+                        <input placeholder="${msg('passwordPlaceholder')}" class=" mt-8" id="password" onfocusin="inputBoxFocusIn(this)" onfocusout="inputBoxFocusOut(this)" name="password" type="password" autocomplete="current-password" />
                     <span class="ui text error hide" id="inCorrectPasswordError">${msg("inCorrectPasswordError")}</span>
                     </div>
                     <div class="remember-forgot-row">
diff --git a/ansible/artifacts/sunbird/login/template.ftl b/ansible/artifacts/sunbird/login/template.ftl
index 94c48b51cd60868aa171b99c4c9cc6ddd2394bd4..597358b24bfa450da3ffc94cc9d644752d5416b8 100644
--- a/ansible/artifacts/sunbird/login/template.ftl
+++ b/ansible/artifacts/sunbird/login/template.ftl
@@ -38,6 +38,7 @@
 </head>
 
 <body class="${properties.kcBodyClass!}">
+    <main>
     <div id="kc-logo"><a href="${properties.kcLogoLink!'#'}" title="kc-logo-wrapper"><div id="kc-logo-wrapper"></div><span class="hide">kc-logo</span></a></div>
 
     <div id="kc-container" class="${properties.kcContainerClass!}">
@@ -116,6 +117,7 @@
             </div>
         </div>
     </div>
+    </main>
 </body>
 </html>
 </#macro>