diff --git a/theme/keywind/login/components/atoms/checkbox.ftl b/theme/keywind/login/components/atoms/checkbox.ftl
index e47fd619a..af8b77b54 100644
--- a/theme/keywind/login/components/atoms/checkbox.ftl
+++ b/theme/keywind/login/components/atoms/checkbox.ftl
@@ -1,15 +1,32 @@
-<#macro kw checked=false label="" name="" rest...>
+<#macro
+  kw
+  autofocus=false
+  checked=false
+  disabled=false
+  id=""
+  invalid=false
+  label=""
+  name=""
+  required=false
+  rest...
+>
   <div class="flex items-center">
     <input
+      <#if autofocus>autofocus</#if>
+      <#if disabled>disabled</#if>
+      <#if required>required</#if>
       <#if checked>checked</#if>
 
+      aria-invalid="${invalid?c}"
       class="border-secondary-200 h-4 rounded text-primary-600 w-4 focus:ring-primary-200 focus:ring-opacity-50"
-      id="${name}"
+      id="<#if id=="">${name}<#else>${id}</#if>"
       name="${name}"
       type="checkbox"
 
       <#list rest as attrName, attrValue>
-        ${attrName}="${attrValue}"
+        <#if attrValue!="">
+          ${attrName}="${attrValue}"
+        </#if>
       </#list>
     >
     <label class="ml-2 text-secondary-600 text-sm" for="${name}">
diff --git a/theme/keywind/login/components/atoms/input.ftl b/theme/keywind/login/components/atoms/input.ftl
index 01e2897ad..bde582282 100644
--- a/theme/keywind/login/components/atoms/input.ftl
+++ b/theme/keywind/login/components/atoms/input.ftl
@@ -1,33 +1,70 @@
+<#import "/assets/icons/eye.ftl" as iconEye>
+<#import "/assets/icons/eye-slash.ftl" as iconEyeSlash>
 <#macro
   kw
   autofocus=false
   disabled=false
+  id=""
   invalid=false
   label=""
   message=""
   name=""
-  required=true
+  required=false
+  type="text"
   rest...
 >
   <div>
     <label class="sr-only" for="${name}">
       ${label}
     </label>
-    <input
-      <#if autofocus>autofocus</#if>
-      <#if disabled>disabled</#if>
-      <#if required>required</#if>
+    <#if type == "password">
+      <div class="relative">
+        <input
+          <#if autofocus>autofocus</#if>
+          <#if disabled>disabled</#if>
+          <#if required>required</#if>
 
-      aria-invalid="${invalid?c}"
-      class="block border-secondary-200 mt-1 rounded-md w-full focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 sm:text-sm"
-      id="${name}"
-      name="${name}"
-      placeholder="${label}"
+          aria-invalid="${invalid?c}"
+          class="block border-secondary-200 mt-1 pr-8 rounded-md w-full focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 sm:text-sm"
+          id="<#if id=="">${name}<#else>${id}</#if>"
+          name="${name}"
+          placeholder="${label}"
+          type="${type}"
 
-      <#list rest as attrName, attrValue>
-        ${attrName}="${attrValue}"
-      </#list>
-    >
+          <#list rest as attrName, attrValue>
+            <#if attrValue!="">
+              ${attrName}="${attrValue}"
+            </#if>
+          </#list>
+        />
+        <button class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm leading-5" type="button" aria-label="${msg("showPassword")}"
+            aria-controls="${name}" data-password-toggle
+            data-label-show="${msg('showPassword')}" data-label-hide="${msg('hidePassword')}">
+          <@iconEye.kw style="display: block;" />
+          <@iconEyeSlash.kw style="display: none;" />
+        </button>
+      </div>
+      <script type="module" src="${url.resourcesPath}/dist/passwordVisibility.js" defer></script>
+    <#else>
+      <input
+        <#if autofocus>autofocus</#if>
+        <#if disabled>disabled</#if>
+        <#if required>required</#if>
+
+        aria-invalid="${invalid?c}"
+        class="block border-secondary-200 mt-1 rounded-md w-full focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 sm:text-sm"
+        id="<#if id=="">${name}<#else>${id}</#if>"
+        name="${name}"
+        placeholder="${label}"
+        type="${type}"
+
+        <#list rest as attrName, attrValue>
+          <#if attrValue!="">
+            ${attrName}="${attrValue}"
+          </#if>
+        </#list>
+      >
+    </#if>
     <#if invalid?? && message??>
       <div class="mt-2 text-red-600 text-sm">
         ${message?no_esc}
diff --git a/theme/keywind/login/components/atoms/link.ftl b/theme/keywind/login/components/atoms/link.ftl
index bde766653..0baf40494 100644
--- a/theme/keywind/login/components/atoms/link.ftl
+++ b/theme/keywind/login/components/atoms/link.ftl
@@ -22,7 +22,9 @@
     class="<#compress>${colorClass} ${sizeClass} inline-flex</#compress>"
 
     <#list rest as attrName, attrValue>
-      ${attrName}="${attrValue}"
+      <#if attrValue!="">
+        ${attrName}="${attrValue}"
+      </#if>
     </#list>
   >
     <#nested>
diff --git a/theme/keywind/login/components/atoms/radio.ftl b/theme/keywind/login/components/atoms/radio.ftl
index 5596d5c4b..747b4312d 100644
--- a/theme/keywind/login/components/atoms/radio.ftl
+++ b/theme/keywind/login/components/atoms/radio.ftl
@@ -1,14 +1,32 @@
-<#macro kw checked=false id="" label="" rest...>
+<#macro
+  kw
+  autofocus=false
+  checked=false
+  disabled=false
+  id=""
+  invalid=false
+  label=""
+  name=""
+  required=false
+  rest...
+>
   <div>
     <input
+      <#if autofocus>autofocus</#if>
+      <#if disabled>disabled</#if>
+      <#if required>required</#if>
       <#if checked>checked</#if>
 
+      aria-invalid="${invalid?c}"
       class="border-secondary-200 focus:ring-primary-600"
-      id="${id}"
+      id="<#if id=="">${name}<#else>${id}</#if>"
+      name="${name}"
       type="radio"
 
       <#list rest as attrName, attrValue>
-        ${attrName}="${attrValue}"
+        <#if attrValue!="">
+          ${attrName}="${attrValue}"
+        </#if>
       </#list>
     >
     <label class="ml-2 text-secondary-600 text-sm" for="${id}">
diff --git a/theme/keywind/login/components/atoms/select.ftl b/theme/keywind/login/components/atoms/select.ftl
new file mode 100644
index 000000000..1e205ba76
--- /dev/null
+++ b/theme/keywind/login/components/atoms/select.ftl
@@ -0,0 +1,44 @@
+<#macro kw
+  autofocus=false
+  checked=false
+  disabled=false
+  id=""
+  invalid=false
+  label=""
+  message=""
+  multiple=false
+  name=""
+  required=false
+  rest...
+>
+  <div>
+    <label class="sr-only" for="${name}">
+      ${label}
+    </label>
+    <select
+      <#if autofocus>autofocus</#if>
+      <#if disabled>disabled</#if>
+      <#if required>required</#if>
+      <#if multiple>multiple</#if>
+
+      aria-invalid="${invalid?c}"
+      class="block border-secondary-200 mt-1 rounded-md w-full focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 sm:text-sm"
+      id="<#if id=="">${name}<#else>${id}</#if>"
+      name="${name}"
+      placeholder="${label}"
+
+      <#list rest as attrName, attrValue>
+        <#if attrValue!="">
+          ${attrName}="${attrValue}"
+        </#if>
+      </#list>
+    >
+      <#nested />
+    </select>
+    <#if invalid?? && message??>
+      <div class="mt-2 text-red-600 text-sm">
+        ${message?no_esc}
+      </div>
+    </#if>
+  </div>
+</#macro>
diff --git a/theme/keywind/login/components/atoms/textarea.ftl b/theme/keywind/login/components/atoms/textarea.ftl
new file mode 100644
index 000000000..e90e329ac
--- /dev/null
+++ b/theme/keywind/login/components/atoms/textarea.ftl
@@ -0,0 +1,41 @@
+<#macro kw
+  autofocus=false
+  disabled=false
+  id=""
+  invalid=false
+  label=""
+  message=""
+  name=""
+  required=false
+  rest...
+>
+  <div>
+    <label class="sr-only" for="${name}">
+      ${label}
+    </label>
+    <textarea
+      <#if autofocus>autofocus</#if>
+      <#if disabled>disabled</#if>
+      <#if required>required</#if>
+
+      aria-invalid="${invalid?c}"
+      class="block border-secondary-200 mt-1 rounded-md w-full focus:border-primary-300 focus:ring focus:ring-primary-200 focus:ring-opacity-50 sm:text-sm"
+      id="<#if id=="">${name}<#else>${id}</#if>"
+      name="${name}"
+      placeholder="${label}"
+
+      <#list rest as attrName, attrValue>
+        <#if attrValue!="">
+          ${attrName}="${attrValue}"
+        </#if>
+      </#list>
+    ><#compress>
+      <#nested />
+    </#compress></textarea>
+    <#if invalid?? && message??>
+      <div class="mt-2 text-red-600 text-sm">
+        ${message?no_esc}
+      </div>
+    </#if>
+  </div>
+</#macro>
diff --git a/theme/keywind/login/components/molecules/register-commons.ftl b/theme/keywind/login/components/molecules/register-commons.ftl
new file mode 100644
index 000000000..1b5ff310b
--- /dev/null
+++ b/theme/keywind/login/components/molecules/register-commons.ftl
@@ -0,0 +1,20 @@
+<#import "../atoms/input.ftl" as input>
+<#macro termsAcceptance>
+    <#if termsAcceptanceRequired??>
+      <div>
+          ${msg("termsTitle")}
+          <div class="text-sm opacity-80">
+              ${kcSanitize(msg("termsText"))?no_esc}
+          </div>
+      </div>
+      <@input.kw
+        type="checkbox"
+        id="termsAccepted"
+        name="termsAccepted"
+        label=msg("acceptTerms")
+        invalid=messagesPerField.existsError('termsAccepted')
+        message=kcSanitize(messagesPerField.get('termsAccepted'))?no_esc
+        required=true
+        />
+    </#if>
+</#macro>
diff --git a/theme/keywind/login/components/molecules/user-profile-commons.ftl b/theme/keywind/login/components/molecules/user-profile-commons.ftl
new file mode 100644
index 000000000..b322a8b37
--- /dev/null
+++ b/theme/keywind/login/components/molecules/user-profile-commons.ftl
@@ -0,0 +1,220 @@
+<#import "../atoms/checkbox.ftl" as checkbox>
+<#import "../atoms/input.ftl" as input>
+<#import "../atoms/radio.ftl" as radio>
+<#import "../atoms/select.ftl" as select>
+<#import "../atoms/textarea.ftl" as textarea>
+
+<#macro userProfileFormFields>
+	<#assign currentGroup="">
+
+	<#list profile.attributes as attribute>
+
+		<#assign groupName = attribute.group!"">
+		<#if groupName != currentGroup>
+			<#assign currentGroup=groupName>
+			<#if currentGroup != "" >
+				<div>
+					<#assign groupDisplayHeader=attribute.groupDisplayHeader!"">
+					<#if groupDisplayHeader != "">
+						<#assign groupHeaderText=advancedMsg(attribute.groupDisplayHeader)!groupName>
+					<#else>
+						<#assign groupHeaderText=groupName>
+					</#if>
+					<div class="font-bold">
+						<label id="header-${groupName}">${groupHeaderText}</label>
+					</div>
+
+					<#assign groupDisplayDescription=attribute.groupDisplayDescription!"">
+					<#if groupDisplayDescription != "">
+						<#assign groupDescriptionText=advancedMsg(attribute.groupDisplayDescription)!"">
+						<div class="italic pl-1">
+							<label id="description-${groupName}">${groupDescriptionText}</label>
+						</div>
+					</#if>
+				</div>
+			</#if>
+		</#if>
+
+		<#nested "beforeField" attribute>
+		<#if attribute.annotations.inputHelperTextBefore??>
+			<div class="${properties.kcInputHelperTextBeforeClass!}" id="form-help-text-before-${attribute.name}" aria-live="polite">${kcSanitize(advancedMsg(attribute.annotations.inputHelperTextBefore))?no_esc}</div>
+		</#if>
+		<@inputFieldByType attribute=attribute/>
+		<#if attribute.annotations.inputHelperTextAfter??>
+			<div class="${properties.kcInputHelperTextAfterClass!}" id="form-help-text-after-${attribute.name}" aria-live="polite">${kcSanitize(advancedMsg(attribute.annotations.inputHelperTextAfter))?no_esc}</div>
+		</#if>
+		<#nested "afterField" attribute>
+	</#list>
+</#macro>
+
+<#macro inputFieldByType attribute>
+	<#switch attribute.annotations.inputType!''>
+	<#case 'textarea'>
+		<@textareaTag attribute=attribute/>
+		<#break>
+	<#case 'select'>
+	<#case 'multiselect'>
+		<@selectTag attribute=attribute/>
+		<#break>
+	<#case 'select-radiobuttons'>
+	<#case 'multiselect-checkboxes'>
+		<@inputTagSelects attribute=attribute/>
+		<#break>
+	<#default>
+		<@inputTag attribute=attribute/>
+	</#switch>
+</#macro>
+
+<#macro inputTag attribute>
+  <#assign type>
+    <@inputTagType attribute=attribute />
+  </#assign>
+  <#assign label>
+    <@labelText attribute=attribute />
+  </#assign>
+	<@input.kw
+    type=type?markup_string
+    name=attribute.name
+    value=attribute.value!''
+		disabled=attribute.readOnly
+    label=label?markup_string
+		invalid=messagesPerField.existsError('${attribute.name}')
+    message=kcSanitize(messagesPerField.getFirstError('${attribute.name}'))
+		autocomplete=(attribute.autocomplete)!""
+		placeholder=(attribute.annotations.inputTypePlaceholder)!""
+		pattern=(attribute.annotations.inputTypePattern)!""
+		size=(attribute.annotations.inputTypeSize)!""
+		maxlength=(attribute.annotations.inputTypeMaxlength)!""
+		minlength=(attribute.annotations.inputTypeMinlength)!""
+		max=(attribute.annotations.inputTypeMax)!""
+		min=(attribute.annotations.inputTypeMin)!""
+		step=(attribute.annotations.inputTypeStep)!""
+    required=attribute.required
+	/>
+</#macro>
+
+<#macro inputTagType attribute>
+	<#compress>
+	<#if attribute.annotations.inputType??>
+		<#if attribute.annotations.inputType?starts_with("html5-")>
+			${attribute.annotations.inputType[6..]}
+		<#else>
+			${attribute.annotations.inputType}
+		</#if>
+	<#else>
+	  text
+	</#if>
+	</#compress>
+</#macro>
+
+<#macro textareaTag attribute>
+  <#assign label>
+    <@labelText attribute=attribute />
+  </#assign>
+	<@textarea.kw
+    name=attribute.name
+		disabled=attribute.readOnly
+    label=label?markup_string
+		invalid=messagesPerField.existsError('${attribute.name}')
+    message=kcSanitize(messagesPerField.getFirstError('${attribute.name}'))
+		cols=(attribute.annotations.inputTypeCols)!""
+		rows=(attribute.annotations.inputTypeRows)!""
+		maxlength=(attribute.annotations.inputTypeMaxlength)!""
+    required=attribute.required
+	>${(attribute.value!'')}</@textarea.kw>
+</#macro>
+
+<#macro selectTag attribute>
+  <#assign label>
+    <@labelText attribute=attribute />
+  </#assign>
+	<@select.kw
+    name=attribute.name
+		disabled=attribute.readOnly
+    label=label?markup_string
+		invalid=messagesPerField.existsError('${attribute.name}')
+    message=kcSanitize(messagesPerField.getFirstError('${attribute.name}'))
+		multiple=attribute.annotations.inputType=='multiselect'
+		size=(attribute.annotations.inputTypeSize)!""
+    required=attribute.required
+	>
+	<#if attribute.annotations.inputType=='select'>
+		<option value="">${label?markup_string}</option>
+	</#if>
+
+	<#if attribute.annotations.inputOptionsFromValidation?? && attribute.validators[attribute.annotations.inputOptionsFromValidation]?? && attribute.validators[attribute.annotations.inputOptionsFromValidation].options??>
+		<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
+	<#elseif attribute.validators.options?? && attribute.validators.options.options??>
+		<#assign options=attribute.validators.options.options>
+	</#if>
+
+	<#if options??>
+		<#list options as option>
+		<option value="${option}" <#if attribute.values?seq_contains(option)>selected</#if>><@selectOptionLabelText attribute=attribute option=option/></option>
+		</#list>
+	</#if>
+	</@select.kw>
+</#macro>
+
+<#macro inputTagSelects attribute>
+	<#if attribute.annotations.inputOptionsFromValidation?? && attribute.validators[attribute.annotations.inputOptionsFromValidation]?? && attribute.validators[attribute.annotations.inputOptionsFromValidation].options??>
+		<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
+	<#elseif attribute.validators.options?? && attribute.validators.options.options??>
+		<#assign options=attribute.validators.options.options>
+	</#if>
+
+  <label class="sr-only" for="${attribute.name}">
+    <@labelText attribute=attribute />
+  </label>
+
+	<#if options??>
+		<#list options as option>
+      <#assign optionLabel>
+        <@selectOptionLabelText attribute=attribute option=option/>
+      </#assign>
+      <#if attribute.annotations.inputType=='select-radiobuttons'>
+        <@radio.kw
+          id="${attribute.name}-${option}"
+          name=attribute.name
+          value=option
+          label=optionLabel?markup_string
+          invalid=messagesPerField.existsError('${attribute.name}')
+          message=kcSanitize(messagesPerField.getFirstError('${attribute.name}'))
+          disabled=attribute.readOnly
+          checked=attribute.values?seq_contains(option)
+        />
+      <#else>
+        <@checkbox.kw
+          id="${attribute.name}-${option}"
+          name=attribute.name
+          value=option
+          label=optionLabel?markup_string
+          invalid=messagesPerField.existsError('${attribute.name}')
+          message=kcSanitize(messagesPerField.getFirstError('${attribute.name}'))
+          disabled=attribute.readOnly
+          checked=attribute.values?seq_contains(option)
+        />
+      </#if>
+		</#list>
+	</#if>
+</#macro>
+
+<#macro selectOptionLabelText attribute option>
+	<#compress>
+	<#if attribute.annotations.inputOptionLabels??>
+		${advancedMsg(attribute.annotations.inputOptionLabels[option]!option)}
+	<#else>
+		<#if attribute.annotations.inputOptionLabelsI18nPrefix??>
+			${msg(attribute.annotations.inputOptionLabelsI18nPrefix + '.' + option)}
+		<#else>
+			${option}
+		</#if>
+	</#if>
+	</#compress>
+</#macro>
+
+<#macro labelText attribute>
+	<#compress>
+    ${advancedMsg(attribute.displayName!'')} <#if attribute.required>*</#if>
+	</#compress>
+</#macro>
diff --git a/theme/keywind/login/login-otp.ftl b/theme/keywind/login/login-otp.ftl
index b1bb3b975..187a86c63 100644
--- a/theme/keywind/login/login-otp.ftl
+++ b/theme/keywind/login/login-otp.ftl
@@ -38,6 +38,7 @@
         label=totpLabel
         message=kcSanitize(messagesPerField.get("totp"))
         name="otp"
+        required=true
         type="text"
       />
       <@buttonGroup.kw>
diff --git a/theme/keywind/login/login-password.ftl b/theme/keywind/login/login-password.ftl
index 54e7d9dca..fb0e8e62f 100644
--- a/theme/keywind/login/login-password.ftl
+++ b/theme/keywind/login/login-password.ftl
@@ -20,6 +20,7 @@
         label=msg("password")
         message=kcSanitize(messagesPerField.get("password"))?no_esc
         name="password"
+        required=true
         type="password"
       />
       <#if realm.resetPasswordAllowed>
diff --git a/theme/keywind/login/login-recovery-authn-code-input.ftl b/theme/keywind/login/login-recovery-authn-code-input.ftl
index a46bcfa09..5a005983e 100644
--- a/theme/keywind/login/login-recovery-authn-code-input.ftl
+++ b/theme/keywind/login/login-recovery-authn-code-input.ftl
@@ -14,6 +14,7 @@
         autofocus=true
         label=msg("auth-recovery-code-prompt", recoveryAuthnCodesInputBean.codeNumber?c)
         name="recoveryCodeInput"
+        required=true
         type="text"
       />
       <@buttonGroup.kw>
diff --git a/theme/keywind/login/login-reset-password.ftl b/theme/keywind/login/login-reset-password.ftl
index b0516aae8..80dcfa78b 100644
--- a/theme/keywind/login/login-reset-password.ftl
+++ b/theme/keywind/login/login-reset-password.ftl
@@ -25,6 +25,7 @@
         label=usernameLabel
         message=kcSanitize(messagesPerField.get("username"))
         name="username"
+        required=true
         type="text"
         value=(auth?has_content && auth.showUsername())?then(auth.attemptedUsername, '')
       />
diff --git a/theme/keywind/login/login-update-password.ftl b/theme/keywind/login/login-update-password.ftl
index ed82380e2..d78dbcf78 100644
--- a/theme/keywind/login/login-update-password.ftl
+++ b/theme/keywind/login/login-update-password.ftl
@@ -4,6 +4,7 @@
 <#import "components/atoms/checkbox.ftl" as checkbox>
 <#import "components/atoms/form.ftl" as form>
 <#import "components/atoms/input.ftl" as input>
+<#import "components/molecules/password-commons.ftl" as passwordCommons>
 
 <@layout.registrationLayout
   displayMessage=!messagesPerField.existsError("password", "password-confirm")
@@ -27,6 +28,7 @@
         invalid=messagesPerField.existsError("password", "password-confirm")
         label=msg("passwordNew")
         name="password-new"
+        required=true
         type="password"
       />
       <@input.kw
@@ -35,8 +37,10 @@
         label=msg("passwordConfirm")
         message=kcSanitize(messagesPerField.get("password-confirm"))
         name="password-confirm"
+        required=true
         type="password"
       />
+      <@passwordCommons.logoutOtherSessions/>
       <#if isAppInitiatedAction??>
         <@checkbox.kw
           checked=true
diff --git a/theme/keywind/login/login-update-profile.ftl b/theme/keywind/login/login-update-profile.ftl
index 306bad944..1413992ae 100644
--- a/theme/keywind/login/login-update-profile.ftl
+++ b/theme/keywind/login/login-update-profile.ftl
@@ -21,6 +21,7 @@
           label=msg("username")
           message=kcSanitize(messagesPerField.get("username"))
           name="username"
+          required=true
           type="text"
           value=(user.username)!''
         />
@@ -31,6 +32,7 @@
         label=msg("email")
         message=kcSanitize(messagesPerField.get("email"))
         name="email"
+        required=true
         type="email"
         value=(user.email)!''
       />
@@ -40,6 +42,7 @@
         label=msg("firstName")
         message=kcSanitize(messagesPerField.get("firstName"))
         name="firstName"
+        required=true
         type="text"
         value=(user.firstName)!''
       />
@@ -49,6 +52,7 @@
         label=msg("lastName")
         message=kcSanitize(messagesPerField.get("lastName"))
         name="lastName"
+        required=true
         type="text"
         value=(user.lastName)!''
       />
diff --git a/theme/keywind/login/login-username.ftl b/theme/keywind/login/login-username.ftl
index b8064b2da..551dc8117 100644
--- a/theme/keywind/login/login-username.ftl
+++ b/theme/keywind/login/login-username.ftl
@@ -34,6 +34,7 @@
             label=usernameLabel
             message=kcSanitize(messagesPerField.get("username"))?no_esc
             name="username"
+            required=true
             type="text"
             value=(login.username)!''
           />
diff --git a/theme/keywind/login/login.ftl b/theme/keywind/login/login.ftl
index 331da069f..1af04018a 100644
--- a/theme/keywind/login/login.ftl
+++ b/theme/keywind/login/login.ftl
@@ -38,6 +38,7 @@
           label=usernameLabel
           message=kcSanitize(messagesPerField.getFirstError("username", "password"))
           name="username"
+          required=true
           type="text"
           value=(login.username)!''
         />
@@ -45,6 +46,7 @@
           invalid=messagesPerField.existsError("username", "password")
           label=msg("password")
           name="password"
+          required=true
           type="password"
         />
         <#if realm.rememberMe && !usernameEditDisabled?? || realm.resetPasswordAllowed>
diff --git a/theme/keywind/login/register-user-profile.ftl b/theme/keywind/login/register-user-profile.ftl
new file mode 100644
index 000000000..c19f1551e
--- /dev/null
+++ b/theme/keywind/login/register-user-profile.ftl
@@ -0,0 +1,55 @@
+<#import "template.ftl" as layout>
+<#import "components/atoms/button.ftl" as button>
+<#import "components/atoms/form.ftl" as form>
+<#import "components/atoms/input.ftl" as input>
+<#import "components/atoms/link.ftl" as link>
+<#import "components/molecules/user-profile-commons.ftl" as userProfileCommons>
+<#import "components/molecules/register-commons.ftl" as registerCommons>
+
+<@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section>
+  <#if section = "header">
+      ${msg("registerTitle")}
+  <#elseif section = "form">
+    <@form.kw action="${url.registrationAction}" method="post">
+      <@userProfileCommons.userProfileFormFields; callback, attribute>
+        <#if callback = "afterField">
+	        <#-- render password fields just under the username or email (if used as username) -->
+	        <#if passwordRequired?? && (attribute.name == 'username' || (attribute.name == 'email' && realm.registrationEmailAsUsername))>
+	          <@input.kw
+              autocomplete="new-password"
+              invalid=messagesPerField.existsError("password", "password-confirm")
+              label=msg("password") + " *"
+              message=kcSanitize(messagesPerField.getFirstError("password", "password-confirm"))
+              name="password"
+              required=true
+              type="password"
+            />
+            <@input.kw
+              autocomplete="new-password"
+              invalid=messagesPerField.existsError("password-confirm")
+              label=msg("passwordConfirm") + " *"
+              message=kcSanitize(messagesPerField.get("password-confirm"))
+              name="password-confirm"
+              required=true
+              type="password"
+            />
+	        </#if>
+        </#if>  
+      </@userProfileCommons.userProfileFormFields>
+
+      <@registerCommons.termsAcceptance/>
+            
+      <#if recaptchaRequired??>
+        <div class="g-recaptcha" data-sitekey="${recaptchaSiteKey}" data-size="compact"></div>
+      </#if>
+
+      <@button.kw color="primary" type="submit">
+        ${msg("doRegister")}
+      </@button.kw>
+    </@form.kw>
+  <#elseif section="nav">
+    <@link.kw color="secondary" href=url.loginUrl size="small">
+      ${kcSanitize(msg("backToLogin"))?no_esc}
+    </@link.kw>
+  </#if>
+</@layout.registrationLayout>
\ No newline at end of file
diff --git a/theme/keywind/login/register.ftl b/theme/keywind/login/register.ftl
index c1a2f061f..eb6f7f133 100644
--- a/theme/keywind/login/register.ftl
+++ b/theme/keywind/login/register.ftl
@@ -4,6 +4,7 @@
 <#import "components/atoms/form.ftl" as form>
 <#import "components/atoms/input.ftl" as input>
 <#import "components/atoms/link.ftl" as link>
+<#import "components/molecules/register-commons.ftl" as registerCommons>
 
 <@layout.registrationLayout
   displayMessage=!messagesPerField.existsError("firstName", "lastName", "email", "username", "password", "password-confirm")
@@ -18,27 +19,30 @@
         autocomplete="given-name"
         autofocus=true
         invalid=messagesPerField.existsError("firstName")
-        label=msg("firstName")
+        label=msg("firstName") + " *"
         message=kcSanitize(messagesPerField.get("firstName"))
         name="firstName"
+        required=true
         type="text"
         value=(register.formData.firstName)!''
       />
       <@input.kw
         autocomplete="family-name"
         invalid=messagesPerField.existsError("lastName")
-        label=msg("lastName")
+        label=msg("lastName") + " *"
         message=kcSanitize(messagesPerField.get("lastName"))
         name="lastName"
+        required=true
         type="text"
         value=(register.formData.lastName)!''
       />
       <@input.kw
         autocomplete="email"
         invalid=messagesPerField.existsError("email")
-        label=msg("email")
+        label=msg("email") + " *"
         message=kcSanitize(messagesPerField.get("email"))
         name="email"
+        required=true
         type="email"
         value=(register.formData.email)!''
       />
@@ -46,9 +50,10 @@
         <@input.kw
           autocomplete="username"
           invalid=messagesPerField.existsError("username")
-          label=msg("username")
+          label=msg("username") + " *"
           message=kcSanitize(messagesPerField.get("username"))
           name="username"
+          required=true
           type="text"
           value=(register.formData.username)!''
         />
@@ -57,20 +62,23 @@
         <@input.kw
           autocomplete="new-password"
           invalid=messagesPerField.existsError("password", "password-confirm")
-          label=msg("password")
+          label=msg("password") + " *"
           message=kcSanitize(messagesPerField.getFirstError("password", "password-confirm"))
           name="password"
+          required=true
           type="password"
         />
         <@input.kw
           autocomplete="new-password"
           invalid=messagesPerField.existsError("password-confirm")
-          label=msg("passwordConfirm")
+          label=msg("passwordConfirm") + " *"
           message=kcSanitize(messagesPerField.get("password-confirm"))
           name="password-confirm"
+          required=true
           type="password"
         />
       </#if>
+      <@registerCommons.termsAcceptance/>
       <#if recaptchaRequired??>
         <div class="g-recaptcha" data-sitekey="${recaptchaSiteKey}" data-size="compact"></div>
       </#if>
diff --git a/theme/keywind/login/resources/dist/index.css b/theme/keywind/login/resources/dist/index.css
index af80533d6..94bd8e9dc 100644
--- a/theme/keywind/login/resources/dist/index.css
+++ b/theme/keywind/login/resources/dist/index.css
@@ -1 +1 @@
-*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}[type=text],input:where(:not([type])),[type=email],[type=url],[type=password],[type=number],[type=date],[type=datetime-local],[type=month],[type=search],[type=tel],[type=time],[type=week],[multiple],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}[type=text]:focus,input:where(:not([type])):focus,[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=number]:focus,[type=date]:focus,[type=datetime-local]:focus,[type=month]:focus,[type=search]:focus,[type=tel]:focus,[type=time]:focus,[type=week]:focus,[multiple]:focus,textarea:focus,select:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}input::-moz-placeholder,textarea::-moz-placeholder{color:#6b7280;opacity:1}input::placeholder,textarea::placeholder{color:#6b7280;opacity:1}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-date-and-time-value{min-height:1.5em;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field{padding-top:0;padding-bottom:0}select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}[multiple],[size]:where(select:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}[type=checkbox],[type=radio]{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}[type=checkbox]{border-radius:0}[type=radio]{border-radius:100%}[type=checkbox]:focus,[type=radio]:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}[type=checkbox]:checked,[type=radio]:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}[type=radio]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}[type=checkbox]:checked:hover,[type=checkbox]:checked:focus,[type=radio]:checked:hover,[type=radio]:checked:focus{border-color:transparent;background-color:currentColor}[type=checkbox]:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:indeterminate:hover,[type=checkbox]:indeterminate:focus{border-color:transparent;background-color:currentColor}[type=file]{background:unset;border-color:inherit;border-width:0;border-radius:0;padding:0;font-size:unset;line-height:inherit}[type=file]:focus{outline:1px solid ButtonText;outline:1px auto -webkit-focus-ring-color}.shadow-lg{--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000}.focus\:ring,.focus\:ring-2{--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000}.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}[x-cloak]{display:none!important}.separate{display:flex;align-items:center;text-align:center}.separate:after,.separate:before{content:"";flex:1 1 0%;border-bottom-width:1px;--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.separate:not(:empty):after{margin-left:.5rem}.separate:not(:empty):before{margin-right:.5rem}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}.absolute{position:absolute}.relative{position:relative}.-left-4{left:-1rem}.bottom-0{bottom:0}.m-0{margin:0}.mx-auto{margin-left:auto;margin-right:auto}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.ml-2{margin-left:.5rem}.mr-1{margin-right:.25rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.block{display:block}.flex{display:flex}.inline-flex{display:inline-flex}.grid{display:grid}.hidden{display:none}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.max-h-80{max-height:20rem}.min-h-screen{min-height:100vh}.w-4{width:1rem}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-full{width:100%}.max-w-md{max-width:28rem}.list-decimal{list-style-type:decimal}.list-disc{list-style-type:disc}.columns-2{-moz-columns:2;columns:2}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-col{flex-direction:column}.items-center{align-items:center}.items-stretch{align-items:stretch}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-around{justify-content:space-around}.gap-4{gap:1rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(1rem * var(--tw-space-x-reverse));margin-left:calc(1rem * calc(1 - var(--tw-space-x-reverse)))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.5rem * var(--tw-space-y-reverse))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem * var(--tw-space-y-reverse))}.space-y-6>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.5rem * var(--tw-space-y-reverse))}.overflow-y-scroll{overflow-y:scroll}.rounded{border-radius:.25rem}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.border{border-width:1px}.border-secondary-200{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.bg-blue-100{--tw-bg-opacity: 1;background-color:rgb(219 234 254 / var(--tw-bg-opacity))}.bg-green-100{--tw-bg-opacity: 1;background-color:rgb(220 252 231 / var(--tw-bg-opacity))}.bg-orange-100{--tw-bg-opacity: 1;background-color:rgb(255 237 213 / var(--tw-bg-opacity))}.bg-primary-600{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity))}.bg-secondary-100{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.p-4{padding:1rem}.p-8{padding:2rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-4{padding-left:1rem;padding-right:1rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.pl-4{padding-left:1rem}.pt-4{padding-top:1rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.text-blue-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-green-600{--tw-text-opacity: 1;color:rgb(22 163 74 / var(--tw-text-opacity))}.text-orange-600{--tw-text-opacity: 1;color:rgb(234 88 12 / var(--tw-text-opacity))}.text-primary-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-red-600{--tw-text-opacity: 1;color:rgb(220 38 38 / var(--tw-text-opacity))}.text-secondary-600{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.shadow-lg{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:border-transparent:hover{border-color:transparent}.hover\:bg-primary-700:hover{--tw-bg-opacity: 1;background-color:rgb(29 78 216 / var(--tw-bg-opacity))}.hover\:bg-provider-apple\/10:hover{background-color:#0000001a}.hover\:bg-provider-bitbucket\/10:hover{background-color:#0052cc1a}.hover\:bg-provider-discord\/10:hover{background-color:#5865f21a}.hover\:bg-provider-facebook\/10:hover{background-color:#1877f21a}.hover\:bg-provider-github\/10:hover{background-color:#1817171a}.hover\:bg-provider-gitlab\/10:hover{background-color:#fc6d261a}.hover\:bg-provider-google\/10:hover{background-color:#4285f41a}.hover\:bg-provider-instagram\/10:hover{background-color:#e4405f1a}.hover\:bg-provider-linkedin\/10:hover{background-color:#0a66c21a}.hover\:bg-provider-microsoft\/10:hover{background-color:#5e5e5e1a}.hover\:bg-provider-oidc\/10:hover{background-color:#f78c401a}.hover\:bg-provider-openshift\/10:hover{background-color:#ee00001a}.hover\:bg-provider-paypal\/10:hover{background-color:#00457c1a}.hover\:bg-provider-slack\/10:hover{background-color:#4a154b1a}.hover\:bg-provider-stackoverflow\/10:hover{background-color:#f580251a}.hover\:bg-provider-twitter\/10:hover{background-color:#1da1f21a}.hover\:bg-secondary-100:hover{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.hover\:bg-secondary-200:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.hover\:text-primary-500:hover{--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.hover\:text-secondary-900:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.focus\:border-primary-300:focus{--tw-border-opacity: 1;border-color:rgb(147 197 253 / var(--tw-border-opacity))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-2:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-primary-200:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254 / var(--tw-ring-opacity))}.focus\:ring-primary-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(37 99 235 / var(--tw-ring-opacity))}.focus\:ring-secondary-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity))}.focus\:ring-opacity-50:focus{--tw-ring-opacity: .5}.focus\:ring-offset-2:focus{--tw-ring-offset-width: 2px}@media (min-width: 640px){.sm\:py-16{padding-top:4rem;padding-bottom:4rem}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}}
+*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}[type=text],input:where(:not([type])),[type=email],[type=url],[type=password],[type=number],[type=date],[type=datetime-local],[type=month],[type=search],[type=tel],[type=time],[type=week],[multiple],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}[type=text]:focus,input:where(:not([type])):focus,[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=number]:focus,[type=date]:focus,[type=datetime-local]:focus,[type=month]:focus,[type=search]:focus,[type=tel]:focus,[type=time]:focus,[type=week]:focus,[multiple]:focus,textarea:focus,select:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}input::-moz-placeholder,textarea::-moz-placeholder{color:#6b7280;opacity:1}input::placeholder,textarea::placeholder{color:#6b7280;opacity:1}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-date-and-time-value{min-height:1.5em;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field{padding-top:0;padding-bottom:0}select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}[multiple],[size]:where(select:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}[type=checkbox],[type=radio]{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}[type=checkbox]{border-radius:0}[type=radio]{border-radius:100%}[type=checkbox]:focus,[type=radio]:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}[type=checkbox]:checked,[type=radio]:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}[type=radio]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}[type=checkbox]:checked:hover,[type=checkbox]:checked:focus,[type=radio]:checked:hover,[type=radio]:checked:focus{border-color:transparent;background-color:currentColor}[type=checkbox]:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:indeterminate:hover,[type=checkbox]:indeterminate:focus{border-color:transparent;background-color:currentColor}[type=file]{background:unset;border-color:inherit;border-width:0;border-radius:0;padding:0;font-size:unset;line-height:inherit}[type=file]:focus{outline:1px solid ButtonText;outline:1px auto -webkit-focus-ring-color}.shadow-lg{--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000}.focus\:ring,.focus\:ring-2{--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000}.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}[x-cloak]{display:none!important}.separate{display:flex;align-items:center;text-align:center}.separate:after,.separate:before{content:"";flex:1 1 0%;border-bottom-width:1px;--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.separate:not(:empty):after{margin-left:.5rem}.separate:not(:empty):before{margin-right:.5rem}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}.absolute{position:absolute}.relative{position:relative}.inset-y-0{top:0;bottom:0}.-left-4{left:-1rem}.bottom-0{bottom:0}.right-0{right:0}.m-0{margin:0}.mx-auto{margin-left:auto;margin-right:auto}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.ml-2{margin-left:.5rem}.mr-1{margin-right:.25rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.block{display:block}.flex{display:flex}.inline-flex{display:inline-flex}.grid{display:grid}.hidden{display:none}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.max-h-80{max-height:20rem}.min-h-screen{min-height:100vh}.w-4{width:1rem}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-full{width:100%}.max-w-md{max-width:28rem}.list-decimal{list-style-type:decimal}.list-disc{list-style-type:disc}.columns-2{-moz-columns:2;columns:2}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-col{flex-direction:column}.items-center{align-items:center}.items-stretch{align-items:stretch}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-around{justify-content:space-around}.gap-4{gap:1rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(1rem * var(--tw-space-x-reverse));margin-left:calc(1rem * calc(1 - var(--tw-space-x-reverse)))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.5rem * var(--tw-space-y-reverse))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem * var(--tw-space-y-reverse))}.space-y-6>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.5rem * var(--tw-space-y-reverse))}.overflow-y-scroll{overflow-y:scroll}.rounded{border-radius:.25rem}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.border{border-width:1px}.border-secondary-200{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.bg-blue-100{--tw-bg-opacity: 1;background-color:rgb(219 234 254 / var(--tw-bg-opacity))}.bg-green-100{--tw-bg-opacity: 1;background-color:rgb(220 252 231 / var(--tw-bg-opacity))}.bg-orange-100{--tw-bg-opacity: 1;background-color:rgb(255 237 213 / var(--tw-bg-opacity))}.bg-primary-600{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity))}.bg-secondary-100{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.p-4{padding:1rem}.p-8{padding:2rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-4{padding-left:1rem;padding-right:1rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.pl-1{padding-left:.25rem}.pl-4{padding-left:1rem}.pr-3{padding-right:.75rem}.pr-8{padding-right:2rem}.pt-4{padding-top:1rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.italic{font-style:italic}.leading-5{line-height:1.25rem}.text-blue-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-green-600{--tw-text-opacity: 1;color:rgb(22 163 74 / var(--tw-text-opacity))}.text-orange-600{--tw-text-opacity: 1;color:rgb(234 88 12 / var(--tw-text-opacity))}.text-primary-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-red-600{--tw-text-opacity: 1;color:rgb(220 38 38 / var(--tw-text-opacity))}.text-secondary-600{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.opacity-80{opacity:.8}.shadow-lg{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:border-transparent:hover{border-color:transparent}.hover\:bg-primary-700:hover{--tw-bg-opacity: 1;background-color:rgb(29 78 216 / var(--tw-bg-opacity))}.hover\:bg-provider-apple\/10:hover{background-color:#0000001a}.hover\:bg-provider-bitbucket\/10:hover{background-color:#0052cc1a}.hover\:bg-provider-discord\/10:hover{background-color:#5865f21a}.hover\:bg-provider-facebook\/10:hover{background-color:#1877f21a}.hover\:bg-provider-github\/10:hover{background-color:#1817171a}.hover\:bg-provider-gitlab\/10:hover{background-color:#fc6d261a}.hover\:bg-provider-google\/10:hover{background-color:#4285f41a}.hover\:bg-provider-instagram\/10:hover{background-color:#e4405f1a}.hover\:bg-provider-linkedin\/10:hover{background-color:#0a66c21a}.hover\:bg-provider-microsoft\/10:hover{background-color:#5e5e5e1a}.hover\:bg-provider-oidc\/10:hover{background-color:#f78c401a}.hover\:bg-provider-openshift\/10:hover{background-color:#ee00001a}.hover\:bg-provider-paypal\/10:hover{background-color:#00457c1a}.hover\:bg-provider-slack\/10:hover{background-color:#4a154b1a}.hover\:bg-provider-stackoverflow\/10:hover{background-color:#f580251a}.hover\:bg-provider-twitter\/10:hover{background-color:#1da1f21a}.hover\:bg-secondary-100:hover{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.hover\:bg-secondary-200:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.hover\:text-primary-500:hover{--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.hover\:text-secondary-900:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.focus\:border-primary-300:focus{--tw-border-opacity: 1;border-color:rgb(147 197 253 / var(--tw-border-opacity))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-2:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-primary-200:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254 / var(--tw-ring-opacity))}.focus\:ring-primary-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(37 99 235 / var(--tw-ring-opacity))}.focus\:ring-secondary-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity))}.focus\:ring-opacity-50:focus{--tw-ring-opacity: .5}.focus\:ring-offset-2:focus{--tw-ring-offset-width: 2px}@media (min-width: 640px){.sm\:py-16{padding-top:4rem;padding-bottom:4rem}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}}
diff --git a/theme/keywind/login/update-user-profile.ftl b/theme/keywind/login/update-user-profile.ftl
new file mode 100644
index 000000000..71e2f4b21
--- /dev/null
+++ b/theme/keywind/login/update-user-profile.ftl
@@ -0,0 +1,30 @@
+<#import "template.ftl" as layout>
+<#import "components/atoms/button.ftl" as button>
+<#import "components/atoms/button-group.ftl" as buttonGroup>
+<#import "components/atoms/form.ftl" as form>
+<#import "components/molecules/user-profile-commons.ftl" as userProfileCommons>
+
+<@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section>
+    <#if section = "header">
+        ${msg("loginProfileTitle")}
+    <#elseif section = "form">
+        <@form.kw action="${url.loginAction}" method="post">
+            <@userProfileCommons.userProfileFormFields/>
+
+            <@buttonGroup.kw>
+              <#if isAppInitiatedAction??>
+                <@button.kw color="primary" type="submit">
+                  ${msg("doSubmit")}
+                </@button.kw>
+                <@button.kw color="secondary" name="cancel-aia" type="submit" value="true">
+                  ${msg("doCancel")}
+                </@button.kw>
+              <#else>
+                <@button.kw color="primary" type="submit">
+                  ${msg("doSubmit")}
+                </@button.kw>
+              </#if>
+            </@buttonGroup.kw>
+        </@form.kw>
+    </#if>
+</@layout.registrationLayout>