diff --git a/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
index 6b04317a..b53b4c8f 100644
--- a/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
+++ b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
@@ -31,21 +31,20 @@
         <div class="col-12 col-md-6">
             @RenderDetailsItem("fa-solid fa-key", "Password", Context.UserDto.Password)
         </div>
-        
+
         <div class="col-9 col-md-4">
-            <DxTextBox NullText="Old password"                       
+            <DxTextBox @bind-Text="@OldPassword"
+                       NullText="Old password"
+                       Password="true"
+                       CssClass="form-field" />
+            <DxTextBox @bind-Text="@NewPassword"
+                       NullText="New password"
+                       BindValueMode="BindValueMode.OnDelayedInput"
+                       InputDelay="300"
                        Password="true"
                        CssClass="form-field" />
-            <DxTextBox 
-                        @bind-Text="@NewPassword"
-                        NullText="New password"
-                        BindValueMode="BindValueMode.OnDelayedInput"
-                        InputDelay="300"
-                        Password="true"
-                        CssClass="form-field"
-                        />
             <DxTextBox @bind-Text="@ConfirmNewPassword"
-                        ReadOnly="@PasswordNotSet"
+                       ReadOnly="@PasswordNotSet"
                        NullText="Confirm new password"
                        BindValueMode="BindValueMode.OnDelayedInput"
                        InputDelay="300"
@@ -55,7 +54,7 @@
         <div class="col-3 col-md-2">
             <DxButton CssClass="btn btn-primary" Click="SetPassword" Enabled="@isSaveActive"> Save</DxButton>
         </div>
-        
+
         <p>@msg</p>
     </div>
 </div>
@@ -110,8 +109,8 @@
 
     void OnPasswordConfirmed(string password)
     {
-        if(NewPassword == ConfirmNewPassword)
-        {            
+        if (NewPassword == ConfirmNewPassword)
+        {
             PasswordNotConfirmed = false;
             isSaveActive = true;
         }
@@ -120,7 +119,7 @@
             isSaveActive = false;
             msg = "Password and confirmation not matching!";
         }
-        
+
     }
 
     protected async Task SetPassword()
@@ -133,9 +132,9 @@
         var result = await AdminSignalRClient.PostDataAsync(SignalRTags.ChangeUserPassword, changePasswordDto);
 
         if (result != null)
-        {           
-                msg = $"Password saved";
-                StateHasChanged();            
+        {
+            msg = $"Password saved";
+            StateHasChanged();
         }
         else
         {
@@ -154,8 +153,8 @@
     }
 
     protected override async Task OnParametersSetAsync()
-    {   
-      
+    {
+
         await base.OnParametersSetAsync();
     }