diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
index fe05ef2c64..acc2169a06 100644
--- a/packages/bbui/src/Form/Core/TextField.svelte
+++ b/packages/bbui/src/Form/Core/TextField.svelte
@@ -13,6 +13,7 @@
   export let quiet = false
   export let align
   export let autofocus = false
+  export let autocomplete = null
 
   const dispatch = createEventDispatcher()
 
@@ -103,6 +104,7 @@
     class="spectrum-Textfield-input"
     style={align ? `text-align: ${align};` : ""}
     inputmode={type === "number" ? "decimal" : "text"}
+    {autocomplete}
   />
 </div>
 
diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte
index f37cf55b63..d3cb13e731 100644
--- a/packages/bbui/src/Form/Input.svelte
+++ b/packages/bbui/src/Form/Input.svelte
@@ -14,6 +14,7 @@
   export let updateOnChange = true
   export let quiet = false
   export let autofocus
+  export let autocomplete
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -33,6 +34,7 @@
     {type}
     {quiet}
     {autofocus}
+    {autocomplete}
     on:change={onChange}
     on:click
     on:input
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index 602a054eaf..e41ec8f745 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -71,6 +71,7 @@
         }
       }}
       value={productionValue}
+      autocomplete="new-password"
     />
   </div>
   <div>
@@ -83,6 +84,7 @@
       disabled={useProductionValue}
       label="Value"
       value={useProductionValue ? productionValue : developmentValue}
+      autocomplete="new-password"
     />
     <Checkbox bind:value={useProductionValue} text="Use production value" />
   </div>