diff --git a/deps/shui/src/logseq/shui/form/password.cljs b/deps/shui/src/logseq/shui/form/password.cljs
index 1408f362d3..f012aa0bb3 100644
--- a/deps/shui/src/logseq/shui/form/password.cljs
+++ b/deps/shui/src/logseq/shui/form/password.cljs
@@ -13,7 +13,8 @@
      (form-core/input
       (merge
        option
-       {:type (if visible? "text" "password")}))
+       {:type (or (:type option)
+                  (if visible? "text" "password"))}))
      (when-not (string/blank? (:value option))
        (base-core/button
         {:variant :ghost
diff --git a/src/main/frontend/components/e2ee.cljs b/src/main/frontend/components/e2ee.cljs
index 2e1b27b53a..5aca99b8d0 100644
--- a/src/main/frontend/components/e2ee.cljs
+++ b/src/main/frontend/components/e2ee.cljs
@@ -47,9 +47,8 @@
                       (set-matched! (= password-confirm password))))})
 
        [:div.flex.flex-col.gap-2
-        (shui/input
-         {:type "password-confirm"
-          :placeholder "Enter password again"
+        (shui/toggle-password
+         {:placeholder "Enter password again"
           :value password-confirm
           :on-change (fn [e] (set-password-confirm! (-> e .-target .-value)))
           :on-blur (fn [] (set-matched! (= password-confirm password)))})