diff --git a/Borepin/Borepin/PageModel/UserPageModel.cs b/Borepin/Borepin/PageModel/UserPageModel.cs
index 9170663..461b975 100644
--- a/Borepin/Borepin/PageModel/UserPageModel.cs
+++ b/Borepin/Borepin/PageModel/UserPageModel.cs
@@ -194,7 +194,20 @@ namespace Borepin.PageModel
 
         public void UpdatePasswordCommandExecute()
         {
-            _User.Admin.Pwd(NewPassword);
+            IsBusy = true;
+            if (_API.IsConnected)
+            {
+                try
+                {
+                    _User.Admin.Pwd(NewPassword);
+                    NewPassword = string.Empty;
+                }
+                catch (RpcException exception) when (string.Equals(exception.Message, "RPC connection is broken. Task would never return.", StringComparison.Ordinal))
+                {
+                    Log.Debug("RPC Connection Loss");
+                }
+            }
+            IsBusy = false;
         }
         #endregion
     }