diff --git a/frontend/src/app/main/ui/workspace/tokens/common.cljs b/frontend/src/app/main/ui/workspace/tokens/common.cljs
index 39fc4f58b..866f8e660 100644
--- a/frontend/src/app/main/ui/workspace/tokens/common.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/common.cljs
@@ -22,20 +22,18 @@
 
 ;; Components ------------------------------------------------------------------
 
-(mf/defc input
-  {::mf/wrap-props false}
-  [{:keys [type placeholder]
-    :or {type "text"}}]
-  [:input {:type type
-           :class (stl/css :input)
-           :placeholder placeholder}])
-
 (mf/defc labeled-input
   {::mf/wrap-props false}
-  [{:keys [input-ref label default-value on-change auto-focus?]}]
-  [:label {:class (stl/css :labeled-input)}
-   [:span {:class (stl/css :label)} label]
-   [:input {:ref input-ref
-            :default-value default-value
-            :autoFocus auto-focus?
-            :on-change on-change}]])
\ No newline at end of file
+  [{:keys [input-ref label default-value on-change auto-focus? auto-complete?]}]
+  (let [input-props (cond-> {:ref input-ref
+                             :default-value default-value
+                             :autoFocus auto-focus?
+                             :on-change on-change}
+                      ;; Disable auto-complete on form fields for proprietary password managers
+                      ;; https://github.com/orgs/tokens-studio/projects/69/views/11?pane=issue&itemId=63724204
+                      (not auto-complete?) (assoc :data-1p-ignore true
+                                                  :data-lpignore true
+                                                  :autoComplete "off"))]
+    [:label {:class (stl/css :labeled-input)}
+     [:span {:class (stl/css :label)} label]
+     [:& :input input-props]]))