diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index e8743cf65e..657fe795ec 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -101,8 +101,8 @@
                                                     </TextEdit>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.End">
-                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null, IsShowPassword))">
-                                                        <Icon Name="IsShowPassword ? IconName.Eye : IconName.EyeSlash" />
+                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))">
+                                                        <Icon Name="ShowPassword ? IconName.Eye : IconName.EyeSlash" />
                                                     </Button>
                                                 </Addon>
                                             </Addons>
@@ -222,7 +222,9 @@
                                                     </TextEdit>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.End">
-                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"><Icon Name="IconName.EyeSlash"/></Button>
+                                                    <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))">
+                                                        <Icon Name="ShowPassword ? IconName.Eye : IconName.EyeSlash" />
+                                                    </Button>
                                                 </Addon>
                                             </Addons>
                                             <ValidationError Style="display: block"/>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index 3eea6f01c6..403e46601d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -35,7 +35,7 @@ public partial class UserManagement
     protected string CreateModalSelectedTab = DefaultSelectedTab;
 
     protected string EditModalSelectedTab = DefaultSelectedTab;
-    protected bool IsShowPassword { get; set; }
+    protected bool ShowPassword { get; set; }
 
     protected PageToolbar Toolbar { get; } = new();
 
@@ -229,21 +229,18 @@ public partial class UserManagement
         return base.SetToolbarItemsAsync();
     }
 
-    protected virtual void ChangePasswordTextRole(TextRole? textRole, bool? isShowPassword = null)
+    protected virtual void ChangePasswordTextRole(TextRole? textRole)
     {
         if (textRole == null)
         {
             ChangePasswordTextRole(_passwordTextRole == TextRole.Password ? TextRole.Text : TextRole.Password);
+            ShowPassword = !ShowPassword;
         }
         else
         {
             _passwordTextRole = textRole.Value;
         }
 
-        if (isShowPassword.HasValue)
-        {
-            IsShowPassword = !isShowPassword.Value;
-        }
     }
 }
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index cf47e4c82b..0c03d5cbd2 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -69,12 +69,12 @@
                              <FieldLabel>@L["DisplayName:AdminPassword"] *</FieldLabel>
                              <Addons>
                                 <Addon AddonType="AddonType.Body">
-                                    <TextEdit Role="IsShowPassword ? TextRole.Text : TextRole.Password" @bind-Text="@NewEntity.AdminPassword">
+                                    <TextEdit Role="ShowPassword ? TextRole.Text : TextRole.Password" @bind-Text="@NewEntity.AdminPassword">
                                     </TextEdit>
                                 </Addon>
                                 <Addon AddonType="AddonType.End">
-                                    <Button Color="Color.Secondary" Clicked="@(() => ShowHidePassword(IsShowPassword))">
-                                        <Icon Name="IsShowPassword ? IconName.Eye : IconName.EyeSlash" />
+                                    <Button Color="Color.Secondary" Clicked="@(() => TogglePasswordVisibility())">
+                                        <Icon Name="ShowPassword ? IconName.Eye : IconName.EyeSlash" />
                                     </Button>
                                 </Addon>
                             </Addons>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index 89142f2cf6..9d1edbad7a 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -21,7 +21,7 @@ public partial class TenantManagement
 
     protected FeatureManagementModal FeatureManagementModal;
 
-    protected bool IsShowPassword { get; set; }
+    protected bool ShowPassword { get; set; }
 
     protected PageToolbar Toolbar { get; } = new();
 
@@ -127,8 +127,8 @@ public partial class TenantManagement
         return base.SetTableColumnsAsync();
     }
 
-    protected virtual void ShowHidePassword(bool isShowPassword)
+    protected virtual void TogglePasswordVisibility()
     {
-        IsShowPassword = !isShowPassword;
+        ShowPassword = !ShowPassword;
     }
 }