diff --git a/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
index 2918f705..23525980 100644
--- a/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
+++ b/TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
@@ -88,11 +88,10 @@
         get => _newPassword;
         set
         {
-            if (_newPassword != value)
-            {
-                _newPassword = value;
-                OnPasswordSet(value);
-            }
+            if (_newPassword == value) return;
+
+            _newPassword = value;
+            OnPasswordSet(value);
         }
     }
 
@@ -104,11 +103,10 @@
         get => _confirmNewPassword;
         set
         {
-            if (value != null && _confirmNewPassword != value)
-            {
-                _confirmNewPassword = value;
-                OnPasswordConfirmed(value);
-            }
+            if (value == null || _confirmNewPassword == value) return;
+
+            _confirmNewPassword = value;
+            OnPasswordConfirmed(value);
         }
     }
 
@@ -119,6 +117,7 @@
     {
         msg = $"Password to set: {NewPassword}";
         PasswordNotSet = false;
+
         StateHasChanged();
     }
 
@@ -134,62 +133,37 @@
             isSaveActive = false;
             msg = "Password and confirmation not matching!";
         }
-
     }
 
     protected async Task SetPassword()
     {
-        bool isSuccess = false;
-        if (!IsForgotten)
+        bool isSuccess;
+        isSaveActive = false;
+
+        if (IsForgotten)
         {
-            isSaveActive = false;
-
-            var changePasswordDto = new ChangePasswordDto(Context.Id, OldPassword, NewPassword);
-            //var changePasswordDto = new ChangePasswordDto(Context.Id, "Asdasd123456", NewPassword);
-            var result = await AdminSignalRClient.PostDataAsync<ChangePasswordDto, UserModelDtoDetail>(SignalRTags.UserChangePassword, changePasswordDto);
-
-            if (result != null)
-            {
-                msg = $"Password saved";
-                StateHasChanged();
-            }
-            else
-            {
-                msg = "Some error occured during saving, please try again later";
-            }
+            var forgotPasswordDto = new ForgotPasswordDto(Context.UserDto.EmailAddress, NewPassword);
+            isSuccess = await AdminSignalRClient.PostDataAsync<ForgotPasswordDto, UserModelDtoDetail>(SignalRTags.UserForgotPassword, forgotPasswordDto) != null;
         }
         else
         {
-            isSaveActive = false;
-            var forgotPasswordDto = new ForgotPasswordDto(Context.UserDto.EmailAddress, NewPassword);
-            //var changePasswordDto = new ChangePasswordDto(Context.Id, "Asdasd123456", NewPassword);
-            var result = await AdminSignalRClient.PostDataAsync<ForgotPasswordDto, UserModelDtoDetail>(SignalRTags.UserForgotPassword, forgotPasswordDto);
-
-            if (result != null)
-            {
-                isSuccess = true;
-                msg = $"Password saved";
-                StateHasChanged();
-            }
-            else
-            {
-                isSuccess = false;
-                msg = "Some error occured during saving, please try again later";
-            }
+            var changePasswordDto = new ChangePasswordDto(Context.Id, OldPassword, NewPassword);
+            isSuccess = await AdminSignalRClient.PostDataAsync<ChangePasswordDto, UserModelDtoDetail>(SignalRTags.UserChangePassword, changePasswordDto) != null;
         }
+
+        msg = isSuccess ? $"Password saved" : "Some error occured during saving, please try again later";
+
+        StateHasChanged();
         await DataChanged.InvokeAsync(isSuccess);
     }
 
     protected override async Task OnInitializedAsync()
     {
-
-
         await base.OnInitializedAsync();
     }
 
     protected override async Task OnParametersSetAsync()
     {
-
         await base.OnParametersSetAsync();
     }
 
diff --git a/Tiam.Services.Client.Tests/SignalRClientTest.cs b/Tiam.Services.Client.Tests/SignalRClientTest.cs
index 25709da6..fdce0421 100644
--- a/Tiam.Services.Client.Tests/SignalRClientTest.cs
+++ b/Tiam.Services.Client.Tests/SignalRClientTest.cs
@@ -7,6 +7,8 @@ using Azure;
 using DevExpress.Data.Filtering;
 using DevExpress.Data.Linq;
 using DevExpress.Data.Linq.Helpers;
+using Newtonsoft.Json;
+using SkiaSharp;
 using TIAM.Core.Consts;
 using TIAM.Core.Enums;
 using TIAM.Core.Loggers;
@@ -258,6 +260,10 @@ namespace Tiam.Services.Client.Tests
         [DataRow("")]
         public async Task GetAllCarsAndDriversByProductIdAsyncTest_ReturnCarsAndDrivers_WhenHasCarsAndDrivers(string productIdString)
         {
+            //var json = JsonConvert.SerializeObject(5);
+            //var number = JsonConvert.DeserializeObject<int>(json);
+            //Assert.IsTrue(number == 5);
+
             var cars = new List<Car>();
             var drivers = new List<UserProductMapping>();
             var productId = TiamConstClient.TransferProductId; //Guid.Parse(productIdString);