diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
index f4c8e29108..81e34ff51c 100644
--- a/frontend/src/lib/components/InstanceSetting.svelte
+++ b/frontend/src/lib/components/InstanceSetting.svelte
@@ -368,6 +368,11 @@
 							onKeyDown={() => {
 								licenseKeyChanged = true
 							}}
+							onBlur={() => {
+								if ($values[setting.key] && typeof $values[setting.key] === 'string') {
+									$values[setting.key] = $values[setting.key].trim()
+								}
+							}}
 							bind:password={$values[setting.key]}
 						/>
 						<Button
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index c35d9b7ff8..8db5584f96 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -136,6 +136,11 @@
 
 		let shouldReloadPage = false
 		if ($values) {
+			// Trim license key before saving
+			if ($values['license_key'] && typeof $values['license_key'] === 'string') {
+				$values['license_key'] = $values['license_key'].trim()
+			}
+
 			const allSettings = [...Object.values(settings), scimSamlSetting].flatMap((x) =>
 				Object.entries(x)
 			)
diff --git a/frontend/src/lib/components/Password.svelte b/frontend/src/lib/components/Password.svelte
index eebee8eaa2..f6fd20eb09 100644
--- a/frontend/src/lib/components/Password.svelte
+++ b/frontend/src/lib/components/Password.svelte
@@ -9,6 +9,7 @@
 		required?: boolean
 		small?: boolean
 		onKeyDown?: (event: KeyboardEvent) => void
+		onBlur?: (event: FocusEvent) => void
 	}
 
 	let {
@@ -17,7 +18,8 @@
 		disabled = false,
 		required = false,
 		small = false,
-		onKeyDown
+		onKeyDown,
+		onBlur
 	}: Props = $props()
 
 	let red = $derived(required && (password == '' || password == undefined))
@@ -43,6 +45,7 @@
 			type="password"
 			bind:value={password}
 			onkeydown={onKeyDown}
+			onblur={onBlur}
 			autocomplete="new-password"
 			{placeholder}
 			{disabled}
@@ -55,6 +58,7 @@
 			type="text"
 			bind:value={password}
 			onkeydown={bubble('keydown')}
+			onblur={onBlur}
 			autocomplete="new-password"
 			{placeholder}
 			{disabled}