diff --git a/themes/accountWebAuthnAdd.ftl b/themes/accountWebAuthnAdd.ftl
index a920c0d..47f4073 100644
--- a/themes/accountWebAuthnAdd.ftl
+++ b/themes/accountWebAuthnAdd.ftl
@@ -5,7 +5,6 @@
 [#-- @ftlvariable name="tenant" type="io.fusionauth.domain.Tenant" --]
 [#-- @ftlvariable name="tenantId" type="java.util.UUID" --]
 [#-- @ftlvariable name="user" type="io.fusionauth.domain.User" --]
-[#-- @ftlvariable name="webAuthnCredentials" type="java.util.List<io.fusionauth.domain.WebAuthnCredential>" --]
 
 [#import "../../_helpers.ftl" as helpers/]
 
diff --git a/themes/defaultMessages.txt b/themes/defaultMessages.txt
index dd3c375..bdfe3f5 100644
--- a/themes/defaultMessages.txt
+++ b/themes/defaultMessages.txt
@@ -368,6 +368,7 @@ go-back-to-send=Go back to send
 [mismatch]=Unexpected value
 [notEmail]=Invalid email
 [notConfigured]=Not configured
+[previouslyUsed]=Previously used
 [tooLong]=Too long
 [tooShort]=Too short
 [type]=Invalid type
@@ -425,9 +426,11 @@ go-back-to-send=Go back to send
 [doNotMatch]user.password=Passwords don't match
 [singleCase]user.password=Password must use upper and lowercase characters
 [onlyAlpha]user.password=Password must contain a punctuation character
+[previouslyUsed]user.password=Password has been recently used
 [requireNumber]user.password=Password must contain a number character
 [tooShort]user.password=Password does not meet the minimum length requirement
 [tooLong]user.password=Password exceeds the maximum length requirement
+[tooYoung]user.password=Password was changed too recently, try again later
 [blank]user.username=Required
 [duplicate]user.username=An account already exists for that username
 [inactive]user.username=An account already exists for that username but is locked. Contact the administrator for assistance
@@ -505,7 +508,7 @@ go-back-to-send=Go back to send
 [UserLockedException]=Your account has been locked. Please contact your system administrator.
 [UserUnauthenticated]=Oops. It looks like you've gotten here by accident. Please return to your application and log in to begin the authorization sequence.
 [WebAuthnDisabled]=WebAuthn is not currently enabled.
-[WebAuthnCredentialSelectionCanceled]=Credential selection canceled.
+[WebAuthnCredentialSelectionCanceled]=Passkey selection canceled.
 [WebAuthnFailed]=Unable to complete the WebAuthn workflow.
 
 # External authentication errors
diff --git a/themes/helpers.ftl b/themes/helpers.ftl
index 756f499..de7a155 100644
--- a/themes/helpers.ftl
+++ b/themes/helpers.ftl
@@ -573,7 +573,7 @@
 </button>
 [/#macro]
 
-[#macro alternativeLogins clientId identityProviders passwordlessEnabled bootStrapWebauthnEnabled]
+[#macro alternativeLogins clientId identityProviders passwordlessEnabled bootstrapWebauthnEnabled=false]
   [#if identityProviders?has_content || passwordlessEnabled]
     <div class="login-button-container">
       <div class="hr-container">
@@ -596,7 +596,7 @@
       </div>
       [/#if]
 
-      [#if bootStrapWebauthnEnabled]
+      [#if bootstrapWebauthnEnabled]
       <div class="form-row push-less-top">
         [@link url = "/oauth2/webauthn"]
           <div class="magic login-button">
diff --git a/themes/oauth2Authorize.ftl b/themes/oauth2Authorize.ftl
index a0e5124..bf1f3c9 100644
--- a/themes/oauth2Authorize.ftl
+++ b/themes/oauth2Authorize.ftl
@@ -1,7 +1,7 @@
 [#ftl/]
 [#setting url_escaping_charset="UTF-8"]
 [#-- @ftlvariable name="application" type="io.fusionauth.domain.Application" --]
-[#-- @ftlvariable name="bootStrapWebauthnEnabled" type="boolean" --]
+[#-- @ftlvariable name="bootstrapWebauthnEnabled" type="boolean" --]
 [#-- @ftlvariable name="client_id" type="java.lang.String" --]
 [#-- @ftlvariable name="code_challenge" type="java.lang.String" --]
 [#-- @ftlvariable name="code_challenge_method" type="java.lang.String" --]
@@ -109,7 +109,7 @@
      [#if showWebAuthnReauthLink]
        [@helpers.link url="${request.contextPath}/oauth2/webauthn-reauth"] ${theme.message('return-to-webauthn-reauth')} [/@helpers.link]
      [/#if]
-      [@helpers.alternativeLogins clientId=client_id identityProviders=identityProviders passwordlessEnabled=passwordlessEnabled bootStrapWebauthnEnabled=bootStrapWebauthnEnabled/]
+      [@helpers.alternativeLogins clientId=client_id identityProviders=identityProviders passwordlessEnabled=passwordlessEnabled bootstrapWebauthnEnabled=bootstrapWebauthnEnabled/]
     [/@helpers.main]
 
     [@helpers.footer]
diff --git a/themes/oauth2Register.ftl b/themes/oauth2Register.ftl
index 201a021..f3550c4 100644
--- a/themes/oauth2Register.ftl
+++ b/themes/oauth2Register.ftl
@@ -170,7 +170,7 @@
 
         [#-- Identity Provider Buttons (if you want to include these, remove the if-statement) --]
         [#if true]
-          [@helpers.alternativeLogins clientId=client_id identityProviders=identityProviders![] passwordlessEnabled=false bootStrapWebauthnEnabled=false/]
+          [@helpers.alternativeLogins clientId=client_id identityProviders=identityProviders![] passwordlessEnabled=false bootstrapWebauthnEnabled=false/]
         [/#if]
         [#-- End Identity Provider Buttons --]
 
diff --git a/themes/oauth2TwoFactor.ftl b/themes/oauth2TwoFactor.ftl
index 9367169..4ec72b2 100644
--- a/themes/oauth2TwoFactor.ftl
+++ b/themes/oauth2TwoFactor.ftl
@@ -41,7 +41,7 @@
             <label>
               <input type="checkbox" name="trustComputer" [#if trustComputer]checked[/#if]/>
               [#assign trustInDays = (tenant.externalIdentifierConfiguration.twoFactorTrustIdTimeToLiveInSeconds / (24 * 60 * 60))?string("##0")/]
-              [#if application.externalIdentifierConfiguration.twoFactorTrustIdTimeToLiveInSeconds??]
+              [#if (application.externalIdentifierConfiguration.twoFactorTrustIdTimeToLiveInSeconds)??]
                 [#assign trustInDays = (application.externalIdentifierConfiguration.twoFactorTrustIdTimeToLiveInSeconds / (24 * 60 * 60))?string("##0")/]
               [/#if]
               ${theme.message('trust-computer', trustInDays)}