From a8e859af1b34c2216372888d34f535d306c40e0d Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <adzhereleiko@thingsboard.io>
Date: Wed, 12 Nov 2025 12:37:38 +0200
Subject: [PATCH 1/2] UI: Update password expiration message locale

---
 ui-ngx/src/assets/locale/locale.constant-en_US.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 0c501f5c5e..6253425281 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4091,8 +4091,8 @@
         "username": "Username (email)",
         "remember-me": "Remember me",
         "forgot-password": "Forgot Password?",
-        "password-reset": "Password reset",
-        "expired-password-reset-message": "Your credentials has been expired! Please create new password.",
+        "password-reset": "Password Reset",
+        "expired-password-reset-message": "Your password has expired! Please enter a new password.",
         "new-password": "New password",
         "new-password-again": "Confirm new password",
         "password-link-sent-message": "Reset link has been sent",

From 84ae3613becc12d05752a9b6428ec757b0a4efe9 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <adzhereleiko@thingsboard.io>
Date: Wed, 19 Nov 2025 19:43:29 +0200
Subject: [PATCH 2/2] UI: Refactoring

---
 .../modules/login/pages/login/reset-password.component.html   | 4 ++--
 ui-ngx/src/assets/locale/locale.constant-en_US.json           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html b/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
index 5233189902..de4dbec9c1 100644
--- a/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/reset-password.component.html
@@ -18,11 +18,11 @@
 <div class="tb-reset-password-content mat-app-background tb-dark flex flex-row items-center justify-center" style="width: 100%;">
   <mat-card appearance="raised" class="tb-reset-password-card flex-initial">
     <mat-card-header>
-      <mat-card-title class="layout-padding tb-card-title">
+      <mat-card-title class="layout-padding tb-card-title mb-4">
         <span translate class="mat-headline-5 tb-card-title">login.password-reset</span>
       </mat-card-title>
       <mat-card-subtitle *ngIf="isExpiredPassword" class="layout-padding tb-card-title">
-        <div class="tb-card-title" translate>login.expired-password-reset-message</div>
+        <div class="tb-card-title whitespace-pre-line">{{ 'login.expired-password-reset-message' | translate }}</div>
       </mat-card-subtitle>
     </mat-card-header>
     <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 6253425281..8bdd724640 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4092,7 +4092,7 @@
         "remember-me": "Remember me",
         "forgot-password": "Forgot Password?",
         "password-reset": "Password Reset",
-        "expired-password-reset-message": "Your password has expired! Please enter a new password.",
+        "expired-password-reset-message": "Your password has expired! \nPlease enter a new password.",
         "new-password": "New password",
         "new-password-again": "Confirm new password",
         "password-link-sent-message": "Reset link has been sent",