diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 3f59696638..a9ff37ec82 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -173,7 +173,6 @@
 		}
 		if ((value == undefined || value == null) && !ignoreValueUndefined) {
 			value = structuredClone(defaultValue)
-			console.log('computeDefaultValue', value, defaultValue)
 			if (defaultValue === undefined || defaultValue === null) {
 				if (inputCat === 'string') {
 					value = nullable ? null : ''
@@ -185,7 +184,6 @@
 					value = []
 				}
 			} else if (inputCat === 'object') {
-				console.log('computeDefaultValue object', value)
 				evalValueToRaw()
 			}
 		}
diff --git a/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte b/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
index ee1b5a622d..50bc493ccf 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppSchemaForm.svelte
@@ -50,7 +50,7 @@
 	})
 
 	let result: Schema | undefined = undefined
-	let args: Record<string, unknown> = {}
+	let args: Record<string, unknown> = outputs?.values?.peak() ?? {}
 
 	function handleArgsChange() {
 		const newArgs: Record<string, unknown> = {}
@@ -76,6 +76,7 @@
 	$componentControl[id] = {
 		setValue(nvalue: any) {
 			args = nvalue
+			outputs.values.set(nvalue, false)
 		},
 		invalidate(key: string, error: string) {
 			schemaForm?.invalidate(key, error)
diff --git a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
index 5aaa2a5534..c2ffafa7ea 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
@@ -75,7 +75,9 @@
 	function handleDefault(defaultValue: string | undefined) {
 		if (initialHandleDefault) {
 			initialHandleDefault = false
-			return
+			if (value != undefined && value != '') {
+				return
+			}
 		}
 		value = defaultValue
 	}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..d564b314a4
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "windmill",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}