diff --git a/assets/views/auth/register.html b/assets/views/auth/register.html
index 52ab0f5..605c115 100644
--- a/assets/views/auth/register.html
+++ b/assets/views/auth/register.html
@@ -30,7 +30,8 @@
       {{ ui::alert_danger(message=t(key="register-error-invalid", lang=lang | default(value='sk')), extra="mt-3") }}
       {% endif %}
 
-      <form method="post" action="/register" hx-boost="false" class="mt-4 flex flex-col gap-4">
+      <form method="post" action="/register" hx-boost="false" class="mt-4 flex flex-col gap-4"
+        x-data="{ password: '', confirm: '' }">
         <div class="flex flex-col gap-1.5">
           <span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="account-type", lang=lang | default(value='sk')) }}</span>
           <div class="grid grid-cols-2 gap-2">
@@ -59,7 +60,7 @@
             class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">
             {{ t(key="login-password", lang=lang | default(value='sk')) }}
           </label>
-          {{ ui::input(name="password", id="password", type="password", required=true, autocomplete="new-password") }}
+          {{ ui::input(name="password", id="password", type="password", required=true, autocomplete="new-password", attrs='x-model="password"') }}
         </div>
 
         <div class="flex flex-col gap-1">
@@ -67,10 +68,14 @@
             class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">
             {{ t(key="set-password-confirm", lang=lang | default(value='sk')) }}
           </label>
-          {{ ui::input(name="password_confirm", id="password_confirm", type="password", required=true, autocomplete="new-password") }}
+          {{ ui::input(name="password_confirm", id="password_confirm", type="password", required=true, autocomplete="new-password", attrs='x-model="confirm"') }}
+          <span x-cloak x-show="confirm.length > 0 && password !== confirm"
+            class="text-xs text-danger dark:text-danger">
+            {{ t(key="set-password-mismatch", lang=lang | default(value='sk')) }}
+          </span>
         </div>
 
-        {{ ui::button(label=t(key="register-submit", lang=lang | default(value='sk')), type="submit", extra="mt-1 w-full") }}
+        {{ ui::button(label=t(key="register-submit", lang=lang | default(value='sk')), type="submit", extra="mt-1 w-full", attrs=':disabled="password !== confirm"') }}
       </form>
 
       <div class="mt-5 flex items-center gap-3 text-xs text-on-surface/50 dark:text-on-surface-dark/50">