diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html
index 7ec3eaa81..89f98db0a 100644
--- a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html
+++ b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html
@@ -60,11 +60,9 @@
             [style.margin-right]="'auto'"
         />
         <tui-error
+            class="error-passwords"
             [error]="[] | tuiFieldError | async"
             [formGroup]="form"
-            [style.margin-bottom]="'0.8rem'"
-            [style.margin-right]="'auto'"
-            [style.margin-top]="'0'"
         />
         <div class="under-password">
             <label tuiLabel>
diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less
index 334203826..73c0cf1c0 100644
--- a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less
+++ b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less
@@ -81,3 +81,8 @@ form {
 .icons-title {
     font-weight: 700;
 }
+
+.error-passwords {
+    margin-bottom: 0.8rem;
+    margin-right: auto;
+}
diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts
index dd9a93722..a898db07e 100644
--- a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts
@@ -24,7 +24,9 @@ export const checkPasswords: ValidatorFn = (
     const password = control.get('password');
     const confirmPassword = control.get('confirmPassword');
 
-    return password && confirmPassword && password.value === confirmPassword.value
+    return (password && confirmPassword && password?.value === confirmPassword?.value) ||
+        !password?.touched ||
+        !confirmPassword?.touched
         ? null
         : {differentPasswords: true};
 };
@@ -60,7 +62,7 @@ export const checkPasswords: ValidatorFn = (
                 email: 'Invalid email',
                 minlength: ({requiredLength}: {requiredLength: string}) =>
                     of(`Minimum length — ${requiredLength}`),
-                differentPasswords: 'Passwords should be the same',
+                differentPasswords: 'Passwords must be the same',
             },
         },
     ],