diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml
index febab6d081..bb85cc641c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.cshtml
@@ -9,9 +9,10 @@
 <form id="ChangePasswordForm">
     @if (!Model.HideOldPasswordInput)
     {
-        <abp-input asp-for="CurrentPassword"/>
+        <abp-input asp-for="CurrentPassword" class="password-visibility" />
     }
-    <abp-input asp-for="NewPassword"/>
-    <abp-input asp-for="NewPasswordConfirm"/>
-    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
-</form>
+    <abp-input asp-for="NewPassword" class="password-visibility" />
+    <abp-input asp-for="NewPasswordConfirm" class="password-visibility" />
+    <button class="btn btn-secondary" type="button" id="PasswordVisibilityButton"><i class="fa fa-eye-slash" aria-hidden="true"></i></button>
+    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value" />
+</form>
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js
index e2f2fd4969..473cfc1d81 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/Default.js
@@ -1,10 +1,25 @@
 (function ($) {
+    $("#PasswordVisibilityButton").click(function (e) {
+        let button = $(this);
+        let passwordInput = button.parent().find("input");
+        if (!passwordInput) {
+            return;
+        }
+        if (passwordInput.attr("type") === "password") {
+            passwordInput.attr("type", "text");
+        }
+        else {
+            passwordInput.attr("type", "password");
+        }
+        let icon = button.find("i");
+        if (icon) {
+            icon.toggleClass("fa-eye-slash").toggleClass("fa-eye");
+        }
+    });
     $(function () {
         var l = abp.localization.getResource("AbpAccount");
-
         $('#ChangePasswordForm').submit(function (e) {
             e.preventDefault();
-
             if (!$('#ChangePasswordForm').valid()) {
                 return false;
             }
@@ -19,11 +34,11 @@
                 return;
             }
 
-            if (input.currentPassword && input.currentPassword == ''){
+            if (input.currentPassword && input.currentPassword == '') {
                 return;
             }
             
-            if(input.currentPassword == input.newPassword) {
+            if (input.currentPassword == input.newPassword) {
                 abp.message.error(l('NewPasswordSameAsOld'));
                 return;
             }