diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
index 079d8fc378..adac9af08d 100644
--- a/frontend/src/lib/components/InstanceSetting.svelte
+++ b/frontend/src/lib/components/InstanceSetting.svelte
@@ -37,8 +37,8 @@
 	export let loading = true
 	const dispatch = createEventDispatcher()
 
-	if (setting.fieldType == 'select' && $values[setting.key] == undefined){
-				$values[setting.key] = "default";
+	if (setting.fieldType == 'select' && $values[setting.key] == undefined) {
+		$values[setting.key] = 'default'
 	}
 
 	let latestKeyRenewalAttempt: {
@@ -164,6 +164,7 @@
 	}
 </script>
 
+<!-- {JSON.stringify($values, null, 2)} -->
 {#if (!setting.cloudonly || isCloudHosted()) && showSetting(setting.key, $values) && !(setting.hiddenIfNull && $values[setting.key] == null)}
 	{#if setting.ee_only != undefined && !$enterpriseLicense}
 		<div class="flex text-xs items-center gap-1 text-yellow-500 whitespace-nowrap">
@@ -181,676 +182,689 @@
 						{@html setting.description}
 					</span>
 				{/if}
-					</label>
-				<ToggleButtonGroup bind:selected={$values[setting.key]}>
-	        {#each (setting.select_items ?? []) as item }
-						<ToggleButton value={item.value ?? item.label} label={item.label} tooltip={item.tooltip} />
-	        {/each}
-				</ToggleButtonGroup>
+			</label>
+			<ToggleButtonGroup bind:selected={$values[setting.key]}>
+				{#each setting.select_items ?? [] as item}
+					<ToggleButton
+						value={item.value ?? item.label}
+						label={item.label}
+						tooltip={item.tooltip}
+					/>
+				{/each}
+			</ToggleButtonGroup>
 		</div>
 	{:else}
-	<!-- svelte-ignore a11y-label-has-associated-control -->
-	<label class="block pb-2">
-		<span class="text-primary font-semibold text-sm">{setting.label}</span>
-		{#if setting.description}
-			<span class="text-secondary text-xs">
-				{@html setting.description}
-			</span>
-		{/if}
-		{#if setting.tooltip}
-			<Tooltip>{setting.tooltip}</Tooltip>
-		{/if}
-		{#if $values}
-			{@const hasError = setting.isValid && !setting.isValid($values[setting.key])}
-			{#if loading}
-				<Skeleton layout={[[2.5]]} />
-			{:else if setting.fieldType == 'text'}
-				<input
-					disabled={setting.ee_only != undefined && !$enterpriseLicense}
-					type="text"
-					placeholder={setting.placeholder}
-					class={hasError
-						? 'border !border-red-700 !border-opacity-30 !focus:border-red-700 !focus:border-opacity-30'
-						: ''}
-					bind:value={$values[setting.key]}
-				/>
-				{#if setting.advancedToggle}
-					<div class="mt-1">
-						<Toggle
-							size="xs"
-							options={{ right: setting.advancedToggle.label }}
-							checked={setting.advancedToggle.checked($values)}
-							on:change={() => {
-								if (setting.advancedToggle) {
-									$values = setting.advancedToggle.onChange($values)
-								}
-							}}
-						/>
-					</div>
-				{/if}
-			{:else if setting.fieldType == 'textarea'}
-				<textarea
-					disabled={!$enterpriseLicense}
-					rows="2"
-					placeholder={setting.placeholder}
-					bind:value={$values[setting.key]}
-				/>
-				{#if setting.key == 'saml_metadata'}
-					<div class="flex mt-2">
-						<Button
-							disabled={!$enterpriseLicense}
-							on:click={async (e) => {
-								const res = await SettingService.testMetadata({
-									requestBody: $values[setting.key]
-								})
-								sendUserToast(`Metadata valid, see console for full content`)
-								console.log(`Metadata content:`, res)
-							}}>Test content/url</Button
-						>
-					</div>
-				{/if}
-			{:else if setting.fieldType == 'codearea'}
-				<SimpleEditor
-					autoHeight
-					class="editor"
-					lang={setting.codeAreaLang ?? 'txt'}
-					bind:code={$values[setting.key]}
-					fixedOverflowWidgets={false}
-				/>
-			{:else if setting.fieldType == 'license_key'}
-				{@const { valid, expiration } = parseLicenseKey($values[setting.key] ?? '')}
-				<div class="flex gap-2">
-					<Password
-						small
+		<!-- svelte-ignore a11y-label-has-associated-control -->
+		<label class="block pb-2">
+			<span class="text-primary font-semibold text-sm">{setting.label}</span>
+			{#if setting.description}
+				<span class="text-secondary text-xs">
+					{@html setting.description}
+				</span>
+			{/if}
+			{#if setting.tooltip}
+				<Tooltip>{setting.tooltip}</Tooltip>
+			{/if}
+			{#if $values}
+				{@const hasError = setting.isValid && !setting.isValid($values[setting.key])}
+				{#if loading}
+					<Skeleton layout={[[2.5]]} />
+				{:else if setting.fieldType == 'text'}
+					<input
+						disabled={setting.ee_only != undefined && !$enterpriseLicense}
+						type="text"
 						placeholder={setting.placeholder}
-						on:keydown={() => {
-							licenseKeyChanged = true
-						}}
-						bind:password={$values[setting.key]}
+						class={hasError
+							? 'border !border-red-700 !border-opacity-30 !focus:border-red-700 !focus:border-opacity-30'
+							: ''}
+						bind:value={$values[setting.key]}
 					/>
-					<Button
-						variant={$values[setting.key] ? 'contained' : 'border'}
-						size="xs"
-						on:click={async () => {
-							await SettingService.testLicenseKey({
-								requestBody: { license_key: $values[setting.key] }
-							})
-							sendUserToast('Valid key')
-						}}
-					>
-						Test key
-					</Button>
-				</div>
-				<div class="mt-1 flex flex-col gap-1 items-start">
-					{#if $values[setting.key]?.length > 0}
-						{#if valid}
-							<div class="flex flex-row gap-1 items-center">
-								<Info size={12} class="text-tertiary" />
-								<span class="text-tertiary text-xs">License key expires on {expiration ?? ''}</span>
-							</div>
-						{:else if expiration}
-							<div class="flex flex-row gap-1 items-center">
-								<AlertCircle size={12} class="text-red-600" />
-								<span class="text-red-600 dark:text-red-400 text-xs"
-									>License key expired on {expiration}</span
-								>
-							</div>
-						{:else}
-							<div class="flex flex-row gap-1 items-center">
-								<AlertCircle size={12} class="text-red-600" />
-								<span class="text-red-600 dark:text-red-400 text-xs"
-									>Invalid license key format</span
-								>
-							</div>
-						{/if}
-					{/if}
-					{#if latestKeyRenewalAttempt}
-						{@const attemptedAt = new Date(latestKeyRenewalAttempt.attempted_at).toLocaleString()}
-						{@const isTrial = latestKeyRenewalAttempt.result.startsWith('error: trial:')}
-						<div class="relative">
-							<Popover notClickable>
-								<div class="flex flex-row items-center gap-1">
-									{#if latestKeyRenewalAttempt.result === 'success'}
-										<BadgeCheck class="text-green-600" size={12} />
-									{:else}
-										<BadgeX class={isTrial ? 'text-yellow-600' : 'text-red-600'} size={12} />
-									{/if}
-									<span
-										class={classNames(
-											'text-xs',
-											latestKeyRenewalAttempt.result === 'success'
-												? 'text-green-600'
-												: isTrial
-												? 'text-yellow-600'
-												: 'text-red-600'
-										)}
-									>
-										{latestKeyRenewalAttempt.result === 'success'
-											? 'Latest key renewal succeeded'
-											: isTrial
-											? 'Latest key renewal ignored because in trial'
-											: 'Latest key renewal failed'}
-										on {attemptedAt}
-									</span>
-								</div>
-								<div slot="text">
-									{#if latestKeyRenewalAttempt.result === 'success'}
-										<span class="text-green-300">
-											Latest key renewal succeeded on {attemptedAt}
-										</span>
-									{:else if isTrial}
-										<span class="text-yellow-300">
-											License key cannot be renewed during trial ({attemptedAt})
-										</span>
-									{:else}
-										<span class="text-red-300">
-											Latest key renewal failed on {attemptedAt}: {latestKeyRenewalAttempt.result.replace(
-												'error: ',
-												''
-											)}
-										</span>
-									{/if}
-									<br />
-									As long as invoices are paid and usage corresponds to the subscription, the key is
-									renewed daily with a validity of 35 days (grace period).
-								</div>
-							</Popover>
+					{#if setting.advancedToggle}
+						<div class="mt-1">
+							<Toggle
+								size="xs"
+								options={{ right: setting.advancedToggle.label }}
+								checked={setting.advancedToggle.checked($values)}
+								on:change={() => {
+									if (setting.advancedToggle) {
+										$values = setting.advancedToggle.onChange($values)
+									}
+								}}
+							/>
 						</div>
 					{/if}
-					{#if licenseKeyChanged && !$enterpriseLicense}
-						{#if version.startsWith('CE')}
-							<div class="text-red-400"
-								>License key is set but image used is the Community Edition {version}. Switch image
-								to EE.</div
-							>
-						{/if}
-					{/if}
-
-					{#if valid || expiration}
-						<div class="flex flex-row gap-2 mt-1">
-							<Button on:click={renewLicenseKey} loading={renewing} size="xs" color="dark"
-								>Renew key
-							</Button>
-							<Button color="dark" size="xs" loading={opening} on:click={openCustomerPortal}>
-								Open customer portal
-							</Button>
-						</div>
-					{/if}
-				</div>
-			{:else if setting.fieldType == 'email'}
-				<input type="email" placeholder={setting.placeholder} bind:value={$values[setting.key]} />
-			{:else if setting.key == 'critical_alert_mute_ui'}
-				<div class="flex flex-col gap-y-2 my-2 py-2">
-					<Toggle
+				{:else if setting.fieldType == 'textarea'}
+					<textarea
 						disabled={!$enterpriseLicense}
-						bind:checked={$values[setting.key]}
-						options={{ right: setting.description }}
+						rows="2"
+						placeholder={setting.placeholder}
+						bind:value={$values[setting.key]}
 					/>
-					<div class="flex flex-row">
+					{#if setting.key == 'saml_metadata'}
+						<div class="flex mt-2">
+							<Button
+								disabled={!$enterpriseLicense}
+								on:click={async (e) => {
+									const res = await SettingService.testMetadata({
+										requestBody: $values[setting.key]
+									})
+									sendUserToast(`Metadata valid, see console for full content`)
+									console.log(`Metadata content:`, res)
+								}}>Test content/url</Button
+							>
+						</div>
+					{/if}
+				{:else if setting.fieldType == 'codearea'}
+					<SimpleEditor
+						autoHeight
+						class="editor"
+						lang={setting.codeAreaLang ?? 'txt'}
+						bind:code={$values[setting.key]}
+						fixedOverflowWidgets={false}
+					/>
+				{:else if setting.fieldType == 'license_key'}
+					{@const { valid, expiration } = parseLicenseKey($values[setting.key] ?? '')}
+					<div class="flex gap-2">
+						<Password
+							small
+							placeholder={setting.placeholder}
+							on:keydown={() => {
+								licenseKeyChanged = true
+							}}
+							bind:password={$values[setting.key]}
+						/>
 						<Button
-							variant="border"
-							color="light"
-							disabled={!$enterpriseLicense}
+							variant={$values[setting.key] ? 'contained' : 'border'}
 							size="xs"
-							on:click={() => {
-								isCriticalAlertsUIOpen.set(true)
-								dispatch('closeDrawer')
+							on:click={async () => {
+								await SettingService.testLicenseKey({
+									requestBody: { license_key: $values[setting.key] }
+								})
+								sendUserToast('Valid key')
 							}}
 						>
-							Show critical alerts
+							Test key
 						</Button>
 					</div>
-				</div>
-			{:else if setting.fieldType == 'critical_error_channels'}
-				<div class="w-full flex gap-x-16 flex-wrap">
-					<div class="w-full max-w-lg">
-						{#if $enterpriseLicense && Array.isArray($values[setting.key])}
-							{#each $values[setting.key] ?? [] as v, i}
-								<div class="flex w-full max-w-lg mt-1 gap-2 items-center">
-									<select
-										class="max-w-24"
-										on:change={(e) => {
-											if (e.target?.['value']) {
-												$values[setting.key][i] = {
-													[e.target['value']]: ''
-												}
-											}
-										}}
-										value={(() => {
-											if (!v) return 'email'
-											return ['slack_channel', 'teams_channel'].find((type) => type in v) || 'email'
-										})()}
+					<div class="mt-1 flex flex-col gap-1 items-start">
+						{#if $values[setting.key]?.length > 0}
+							{#if valid}
+								<div class="flex flex-row gap-1 items-center">
+									<Info size={12} class="text-tertiary" />
+									<span class="text-tertiary text-xs"
+										>License key expires on {expiration ?? ''}</span
 									>
-										<option value="email">Email</option>
-										<option value="slack_channel">Slack</option>
-										<option value="teams_channel">Teams</option>
-									</select>
-									{#if v && 'slack_channel' in v}
-										<input
-											type="text"
-											placeholder="Slack channel"
-											on:input={(e) => {
+								</div>
+							{:else if expiration}
+								<div class="flex flex-row gap-1 items-center">
+									<AlertCircle size={12} class="text-red-600" />
+									<span class="text-red-600 dark:text-red-400 text-xs"
+										>License key expired on {expiration}</span
+									>
+								</div>
+							{:else}
+								<div class="flex flex-row gap-1 items-center">
+									<AlertCircle size={12} class="text-red-600" />
+									<span class="text-red-600 dark:text-red-400 text-xs"
+										>Invalid license key format</span
+									>
+								</div>
+							{/if}
+						{/if}
+						{#if latestKeyRenewalAttempt}
+							{@const attemptedAt = new Date(latestKeyRenewalAttempt.attempted_at).toLocaleString()}
+							{@const isTrial = latestKeyRenewalAttempt.result.startsWith('error: trial:')}
+							<div class="relative">
+								<Popover notClickable>
+									<div class="flex flex-row items-center gap-1">
+										{#if latestKeyRenewalAttempt.result === 'success'}
+											<BadgeCheck class="text-green-600" size={12} />
+										{:else}
+											<BadgeX class={isTrial ? 'text-yellow-600' : 'text-red-600'} size={12} />
+										{/if}
+										<span
+											class={classNames(
+												'text-xs',
+												latestKeyRenewalAttempt.result === 'success'
+													? 'text-green-600'
+													: isTrial
+													? 'text-yellow-600'
+													: 'text-red-600'
+											)}
+										>
+											{latestKeyRenewalAttempt.result === 'success'
+												? 'Latest key renewal succeeded'
+												: isTrial
+												? 'Latest key renewal ignored because in trial'
+												: 'Latest key renewal failed'}
+											on {attemptedAt}
+										</span>
+									</div>
+									<div slot="text">
+										{#if latestKeyRenewalAttempt.result === 'success'}
+											<span class="text-green-300">
+												Latest key renewal succeeded on {attemptedAt}
+											</span>
+										{:else if isTrial}
+											<span class="text-yellow-300">
+												License key cannot be renewed during trial ({attemptedAt})
+											</span>
+										{:else}
+											<span class="text-red-300">
+												Latest key renewal failed on {attemptedAt}: {latestKeyRenewalAttempt.result.replace(
+													'error: ',
+													''
+												)}
+											</span>
+										{/if}
+										<br />
+										As long as invoices are paid and usage corresponds to the subscription, the key is
+										renewed daily with a validity of 35 days (grace period).
+									</div>
+								</Popover>
+							</div>
+						{/if}
+						{#if licenseKeyChanged && !$enterpriseLicense}
+							{#if version.startsWith('CE')}
+								<div class="text-red-400"
+									>License key is set but image used is the Community Edition {version}. Switch
+									image to EE.</div
+								>
+							{/if}
+						{/if}
+
+						{#if valid || expiration}
+							<div class="flex flex-row gap-2 mt-1">
+								<Button on:click={renewLicenseKey} loading={renewing} size="xs" color="dark"
+									>Renew key
+								</Button>
+								<Button color="dark" size="xs" loading={opening} on:click={openCustomerPortal}>
+									Open customer portal
+								</Button>
+							</div>
+						{/if}
+					</div>
+				{:else if setting.fieldType == 'email'}
+					<input type="email" placeholder={setting.placeholder} bind:value={$values[setting.key]} />
+				{:else if setting.key == 'critical_alert_mute_ui'}
+					<div class="flex flex-col gap-y-2 my-2 py-2">
+						<Toggle
+							disabled={!$enterpriseLicense}
+							bind:checked={$values[setting.key]}
+							options={{ right: setting.description }}
+						/>
+						<div class="flex flex-row">
+							<Button
+								variant="border"
+								color="light"
+								disabled={!$enterpriseLicense}
+								size="xs"
+								on:click={() => {
+									isCriticalAlertsUIOpen.set(true)
+									dispatch('closeDrawer')
+								}}
+							>
+								Show critical alerts
+							</Button>
+						</div>
+					</div>
+				{:else if setting.fieldType == 'critical_error_channels'}
+					<div class="w-full flex gap-x-16 flex-wrap">
+						<div class="w-full max-w-lg">
+							{#if $enterpriseLicense && Array.isArray($values[setting.key])}
+								{#each $values[setting.key] ?? [] as v, i}
+									<div class="flex w-full max-w-lg mt-1 gap-2 items-center">
+										<select
+											class="max-w-24"
+											on:change={(e) => {
 												if (e.target?.['value']) {
 													$values[setting.key][i] = {
-														slack_channel: e.target['value']
+														[e.target['value']]: ''
 													}
 												}
 											}}
-											value={v?.slack_channel ?? ''}
-										/>
-									{:else if v && 'teams_channel' in v}
-										<div class="flex flex-row gap-2 w-full">
-											<select on:change={(e) => handleTeamChange(e, i)}>
-												<option
-													value=""
-													disabled
-													selected={!$values['critical_error_channels'][i]?.teams_channel?.team_id}
-													>Select team</option
-												>
-												{#each $values['teams'] as team}
-													<option
-														value={team.team_id}
-														selected={$values['critical_error_channels'][i]?.teams_channel
-															?.team_id === team.team_id}
-													>
-														{team.team_name}
-													</option>
-												{/each}
-											</select>
-											{#if $values['critical_error_channels'][i]?.teams_channel?.team_id}
-												<select
-													id="channel-select"
-													on:change={(e) => handleChannelChange(e, setting, i)}
-												>
+											value={(() => {
+												if (!v) return 'email'
+												return (
+													['slack_channel', 'teams_channel'].find((type) => type in v) || 'email'
+												)
+											})()}
+										>
+											<option value="email">Email</option>
+											<option value="slack_channel">Slack</option>
+											<option value="teams_channel">Teams</option>
+										</select>
+										{#if v && 'slack_channel' in v}
+											<input
+												type="text"
+												placeholder="Slack channel"
+												on:input={(e) => {
+													if (e.target?.['value']) {
+														$values[setting.key][i] = {
+															slack_channel: e.target['value']
+														}
+													}
+												}}
+												value={v?.slack_channel ?? ''}
+											/>
+										{:else if v && 'teams_channel' in v}
+											<div class="flex flex-row gap-2 w-full">
+												<select on:change={(e) => handleTeamChange(e, i)}>
 													<option
 														value=""
 														disabled
 														selected={!$values['critical_error_channels'][i]?.teams_channel
-															?.channel_id}>Select channel</option
+															?.team_id}>Select team</option
 													>
-													{#each $values['teams'].find((team) => team.team_id === $values['critical_error_channels'][i]?.teams_channel?.team_id)?.channels ?? [] as channel}
+													{#each $values['teams'] as team}
 														<option
-															value={channel.channel_id}
+															value={team.team_id}
 															selected={$values['critical_error_channels'][i]?.teams_channel
-																?.channel_id === channel.channel_id}
+																?.team_id === team.team_id}
 														>
-															{channel.channel_name}
+															{team.team_name}
 														</option>
 													{/each}
 												</select>
-											{/if}
-											<div>
-												<button on:click={fetchTeams} class="flex items-center gap-1 mt-2">
-													<RefreshCcw size={16} class={isFetching ? 'animate-spin' : ''} />
-												</button>
+												{#if $values['critical_error_channels'][i]?.teams_channel?.team_id}
+													<select
+														id="channel-select"
+														on:change={(e) => handleChannelChange(e, setting, i)}
+													>
+														<option
+															value=""
+															disabled
+															selected={!$values['critical_error_channels'][i]?.teams_channel
+																?.channel_id}>Select channel</option
+														>
+														{#each $values['teams'].find((team) => team.team_id === $values['critical_error_channels'][i]?.teams_channel?.team_id)?.channels ?? [] as channel}
+															<option
+																value={channel.channel_id}
+																selected={$values['critical_error_channels'][i]?.teams_channel
+																	?.channel_id === channel.channel_id}
+															>
+																{channel.channel_name}
+															</option>
+														{/each}
+													</select>
+												{/if}
+												<div>
+													<button on:click={fetchTeams} class="flex items-center gap-1 mt-2">
+														<RefreshCcw size={16} class={isFetching ? 'animate-spin' : ''} />
+													</button>
+												</div>
 											</div>
-										</div>
-									{:else}
-										<input
-											type="email"
-											placeholder="Email address"
-											on:input={(e) => {
-												if (e.target?.['value']) {
-													$values[setting.key][i] = {
-														email: e.target['value']
+										{:else}
+											<input
+												type="email"
+												placeholder="Email address"
+												on:input={(e) => {
+													if (e.target?.['value']) {
+														$values[setting.key][i] = {
+															email: e.target['value']
+														}
 													}
-												}
+												}}
+												value={v?.email ?? ''}
+											/>
+										{/if}
+										<button
+											transition:fade|local={{ duration: 100 }}
+											class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
+											aria-label="Clear"
+											on:click={() => {
+												$values[setting.key] = $values[setting.key].filter(
+													(_, index) => index !== i
+												)
 											}}
-											value={v?.email ?? ''}
-										/>
-									{/if}
-									<button
-										transition:fade|local={{ duration: 100 }}
-										class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover"
-										aria-label="Clear"
-										on:click={() => {
-											$values[setting.key] = $values[setting.key].filter((_, index) => index !== i)
-										}}
-									>
-										<X size={14} />
-									</button>
-								</div>
-							{/each}
-						{/if}
+										>
+											<X size={14} />
+										</button>
+									</div>
+								{/each}
+							{/if}
+						</div>
 					</div>
-				</div>
-				<div class="flex mt-2 gap-20 items-center">
-					<Button
-						variant="border"
-						color="light"
-						size="md"
-						btnClasses="mt-1"
-						on:click={() => {
-							if ($values[setting.key] == undefined || !Array.isArray($values[setting.key])) {
-								$values[setting.key] = []
-							}
-							$values[setting.key] = $values[setting.key].concat('')
-						}}
-						id="arg-input-add-item"
-						startIcon={{ icon: Plus }}
-						disabled={!$enterpriseLicense}
-					>
-						Add channel
-					</Button>
-					<div class="flex mt-1">
+					<div class="flex mt-2 gap-20 items-center">
 						<Button
-							disabled={!$enterpriseLicense}
 							variant="border"
 							color="light"
 							size="md"
-							on:click={async () => {
-								try {
-									await SettingService.testCriticalChannels({
-										requestBody: $values[setting.key]
-									})
-									sendUserToast('Test message sent successfully to critical channels', false)
-								} catch (error) {
-									sendUserToast('Failed to send test message: ' + error.message, true)
+							btnClasses="mt-1"
+							on:click={() => {
+								if ($values[setting.key] == undefined || !Array.isArray($values[setting.key])) {
+									$values[setting.key] = []
 								}
+								$values[setting.key] = $values[setting.key].concat('')
 							}}
-						>
-							Test channels
-						</Button>
-					</div>
-				</div>
-			{:else if setting.fieldType == 'slack_connect'}
-				<div class="flex flex-col items-start self-start">
-					{#if $values[setting.key] && 'team_name' in $values[setting.key]}
-						<div class="text-sm">
-							Connected to <code>{$values[setting.key]['team_name']}</code>
-						</div>
-						<Button
-							size="sm"
-							endIcon={{ icon: Slack }}
-							btnClasses="mt-2"
-							variant="border"
-							on:click={async () => {
-								$values[setting.key] = undefined
-							}}
-						>
-							Disconnect Slack
-						</Button>
-					{:else}
-						<Button
-							size="xs"
-							color="dark"
-							href="{base}/api/oauth/connect_slack?instance=true"
-							startIcon={{ icon: Slack }}
+							id="arg-input-add-item"
+							startIcon={{ icon: Plus }}
 							disabled={!$enterpriseLicense}
 						>
-							Connect to Slack
+							Add channel
 						</Button>
-					{/if}
-				</div>
-			{:else if setting.fieldType == 'indexer_rates'}
-				<div class="flex flex-col gap-4 mt-4">
-					{#if $values[setting.key]}
-						<div>
-							<label for="writer_memory_budget" class="block text-sm font-medium">
-								Index writer memory budget (MB)
-								<Tooltip>
-									The allocated memory arena for the indexer. A bigger value means less writing to
-									disk and potentially higher indexing throughput
-								</Tooltip>
-							</label>
-							<input
+						<div class="flex mt-1">
+							<Button
 								disabled={!$enterpriseLicense}
-								type="number"
-								id="writer_memory_budget"
-								placeholder="300"
-								on:input={(e) => {
-									if (e.target instanceof HTMLInputElement) {
-										if (e.target.valueAsNumber) {
-											$values[setting.key].writer_memory_budget =
-												e.target.valueAsNumber * (1024 * 1024)
-										}
-									}
-								}}
-								value={$values[setting.key].writer_memory_budget / (1024 * 1024)}
-							/>
-						</div>
-						<h3>Completed Job Index</h3>
-						<div>
-							<label for="commit_job_max_batch_size" class="block text-sm font-medium">
-								Commit max batch size <Tooltip>
-									The max amount of documents (here jobs) per commit. To optimize indexing
-									throughput, it is best to keep this as high as possible. However, especially when
-									reindexing the whole instance, it can be useful to have a limit on how many jobs
-									can be written without being commited. A commit will make the jobs available for
-									search, constitute a "checkpoint" state in the indexing and will be logged.
-								</Tooltip>
-							</label>
-							<input
-								disabled={!$enterpriseLicense}
-								type="number"
-								id="commit_job_max_batch_size"
-								placeholder="100000"
-								bind:value={$values[setting.key].commit_job_max_batch_size}
-							/>
-						</div>
-						<div>
-							<label for="refresh_index_period" class="block text-sm font-medium">
-								Refresh index period (s) <Tooltip>
-									The index will query new jobs periodically and write them on the index. This
-									setting sets that period.
-								</Tooltip></label
-							>
-							<input
-								disabled={!$enterpriseLicense}
-								type="number"
-								id="refresh_index_period"
-								placeholder="300"
-								bind:value={$values[setting.key].refresh_index_period}
-							/>
-						</div>
-						<div>
-							<label for="max_indexed_job_log_size" class="block text-sm font-medium">
-								Max indexed job log size (KB) <Tooltip>
-									Job logs are included when indexing, but to avoid the index size growing
-									artificially, the logs will be truncated after a size has been reached.
-								</Tooltip>
-							</label>
-							<input
-								disabled={!$enterpriseLicense}
-								type="number"
-								id="max_indexed_job_log_size"
-								placeholder="1024"
-								on:input={(e) => {
-									if (e.target instanceof HTMLInputElement) {
-										if (e.target.valueAsNumber) {
-											$values[setting.key].max_indexed_job_log_size = e.target.valueAsNumber * 1024
-										}
-									}
-								}}
-								value={$values[setting.key].max_indexed_job_log_size / 1024}
-							/>
-						</div>
-						<h3>Service Logs Index</h3>
-						<div>
-							<label for="commit_log_max_batch_size" class="block text-sm font-medium"
-								>Commit max batch size <Tooltip>
-									The max amount of documents per commit. In this case 1 document is one log file
-									representing all logs during 1 minute for a specific host. To optimize indexing
-									throughput, it is best to keep this as high as possible. However, especially when
-									reindexing the whole instance, it can be useful to have a limit on how many logs
-									can be written without being commited. A commit will make the logs available for
-									search, appear as a log line, and be a "checkpoint" of the indexing progress.
-								</Tooltip>
-							</label>
-							<input
-								disabled={!$enterpriseLicense}
-								type="number"
-								id="commit_log_max_batch_size"
-								placeholder="10000"
-								bind:value={$values[setting.key].commit_log_max_batch_size}
-							/>
-						</div>
-						<div>
-							<label for="refresh_log_index_period" class="block text-sm font-medium">
-								Refresh index period (s) <Tooltip>
-									The index will query new service logs peridically and write them on the index.
-									This setting sets that period.
-								</Tooltip></label
-							>
-							<input
-								disabled={!$enterpriseLicense}
-								type="number"
-								id="refresh_log_index_period"
-								placeholder="300"
-								bind:value={$values[setting.key].refresh_log_index_period}
-							/>
-						</div>
-						<h3>Reset Index</h3>
-						This buttons will clear the whole index, and the service will start reindexing from scratch.
-						Full text search might be down during this time.
-						<div>
-							<ConfirmButton
+								variant="border"
+								color="light"
+								size="md"
 								on:click={async () => {
-									let r = await IndexSearchService.clearIndex({
-										idxName: 'JobIndex'
-									})
-									console.log('asasd')
-									sendUserToast(r)
-								}}>Clear <b>Jobs</b> Index</ConfirmButton
-							>
-							<ConfirmButton
-								on:click={async () => {
-									let r = await IndexSearchService.clearIndex({
-										idxName: 'ServiceLogIndex'
-									})
-									console.log('asasd')
-									sendUserToast(r)
-								}}>Clear <b>Service Logs</b> Index</ConfirmButton
-							>
-						</div>
-					{/if}
-				</div>
-			{:else if setting.fieldType == 'smtp_connect'}
-				<div class="flex flex-col gap-4 border rounded p-4">
-					{#if $values[setting.key]}
-						<div>
-							<label for="smtp_host" class="block text-sm font-medium">Host</label>
-							<input
-								type="text"
-								id="smtp_host"
-								placeholder="smtp.gmail.com"
-								bind:value={$values[setting.key].smtp_host}
-							/>
-						</div>
-						<div>
-							<label for="smtp_port" class="block text-sm font-medium">Port</label>
-							<input
-								type="number"
-								id="smtp_port"
-								placeholder="587"
-								bind:value={$values[setting.key].smtp_port}
-							/>
-						</div>
-						<div>
-							<label for="smtp_username" class="block text-sm font-medium">Username</label>
-							<input
-								type="text"
-								id="smtp_username"
-								placeholder="ruben@windmill.dev"
-								bind:value={$values[setting.key].smtp_username}
-							/>
-						</div>
-						<div>
-							<label for="smtp_password" class="block text-sm font-medium">Password</label>
-							<Password bind:password={$values[setting.key].smtp_password} />
-						</div>
-						<div>
-							<label for="smtp_from" class="block text-sm font-medium">From Address</label>
-							<input
-								type="email"
-								id="smtp_from"
-								placeholder="noreply@windmill.dev"
-								bind:value={$values[setting.key].smtp_from}
-							/>
-						</div>
-						<div>
-							<Toggle
-								disabled={$values[setting.key].smtp_disable_tls == true || !$enterpriseLicense}
-								id="smtp_tls_implicit"
-								bind:checked={$values[setting.key].smtp_tls_implicit}
-								options={{ right: 'Implicit TLS' }}
-								label="Implicit TLS"
-							/>
-						</div>
-						<div>
-							<Toggle
-								id="smtp_disable_tls"
-								disabled={!$enterpriseLicense}
-								bind:checked={$values[setting.key].smtp_disable_tls}
-								on:change={() => {
-									if ($values[setting.key].smtp_disable_tls) {
-										$values[setting.key].smtp_tls_implicit = false
+									try {
+										await SettingService.testCriticalChannels({
+											requestBody: $values[setting.key]
+										})
+										sendUserToast('Test message sent successfully to critical channels', false)
+									} catch (error) {
+										sendUserToast('Failed to send test message: ' + error.message, true)
 									}
 								}}
-								options={{ right: 'Disable TLS' }}
-								label="Disable TLS"
-							/>
+							>
+								Test channels
+							</Button>
 						</div>
-					{/if}
-				</div>
-			{:else if setting.fieldType == 'otel'}
-				<div class="flex flex-col gap-4 border rounded p-4">
-					{#if $values[setting.key]}
-						<div class="flex gap-8">
-							<Toggle
+					</div>
+				{:else if setting.fieldType == 'slack_connect'}
+					<div class="flex flex-col items-start self-start">
+						{#if $values[setting.key] && 'team_name' in $values[setting.key]}
+							<div class="text-sm">
+								Connected to <code>{$values[setting.key]['team_name']}</code>
+							</div>
+							<Button
+								size="sm"
+								endIcon={{ icon: Slack }}
+								btnClasses="mt-2"
+								variant="border"
+								on:click={async () => {
+									$values[setting.key] = undefined
+								}}
+							>
+								Disconnect Slack
+							</Button>
+						{:else}
+							<Button
+								size="xs"
+								color="dark"
+								href="{base}/api/oauth/connect_slack?instance=true"
+								startIcon={{ icon: Slack }}
 								disabled={!$enterpriseLicense}
-								id="tracing_enabled"
-								bind:checked={$values[setting.key].tracing_enabled}
-								options={{ right: 'Tracing' }}
-								label="Tracing"
-							/>
-							<Toggle
-								disabled={!$enterpriseLicense}
-								id="logs_enabled"
-								bind:checked={$values[setting.key].logs_enabled}
-								options={{ right: 'Logs' }}
-								label="logs"
-							/>
-							<Toggle
-								disabled
-								id="metrics_enabled"
-								bind:checked={$values[setting.key].logs_enabled}
-								options={{ right: 'Metrics (coming soon)' }}
-								label="metrics"
-							/>
-						</div>
+							>
+								Connect to Slack
+							</Button>
+						{/if}
+					</div>
+				{:else if setting.fieldType == 'indexer_rates'}
+					<div class="flex flex-col gap-4 mt-4">
+						{#if $values[setting.key]}
+							<div>
+								<label for="writer_memory_budget" class="block text-sm font-medium">
+									Index writer memory budget (MB)
+									<Tooltip>
+										The allocated memory arena for the indexer. A bigger value means less writing to
+										disk and potentially higher indexing throughput
+									</Tooltip>
+								</label>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="writer_memory_budget"
+									placeholder="300"
+									on:input={(e) => {
+										if (e.target instanceof HTMLInputElement) {
+											if (e.target.valueAsNumber) {
+												$values[setting.key].writer_memory_budget =
+													e.target.valueAsNumber * (1024 * 1024)
+											}
+										}
+									}}
+									value={$values[setting.key].writer_memory_budget / (1024 * 1024)}
+								/>
+							</div>
+							<h3>Completed Job Index</h3>
+							<div>
+								<label for="commit_job_max_batch_size" class="block text-sm font-medium">
+									Commit max batch size <Tooltip>
+										The max amount of documents (here jobs) per commit. To optimize indexing
+										throughput, it is best to keep this as high as possible. However, especially
+										when reindexing the whole instance, it can be useful to have a limit on how many
+										jobs can be written without being commited. A commit will make the jobs
+										available for search, constitute a "checkpoint" state in the indexing and will
+										be logged.
+									</Tooltip>
+								</label>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="commit_job_max_batch_size"
+									placeholder="100000"
+									bind:value={$values[setting.key].commit_job_max_batch_size}
+								/>
+							</div>
+							<div>
+								<label for="refresh_index_period" class="block text-sm font-medium">
+									Refresh index period (s) <Tooltip>
+										The index will query new jobs periodically and write them on the index. This
+										setting sets that period.
+									</Tooltip></label
+								>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="refresh_index_period"
+									placeholder="300"
+									bind:value={$values[setting.key].refresh_index_period}
+								/>
+							</div>
+							<div>
+								<label for="max_indexed_job_log_size" class="block text-sm font-medium">
+									Max indexed job log size (KB) <Tooltip>
+										Job logs are included when indexing, but to avoid the index size growing
+										artificially, the logs will be truncated after a size has been reached.
+									</Tooltip>
+								</label>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="max_indexed_job_log_size"
+									placeholder="1024"
+									on:input={(e) => {
+										if (e.target instanceof HTMLInputElement) {
+											if (e.target.valueAsNumber) {
+												$values[setting.key].max_indexed_job_log_size =
+													e.target.valueAsNumber * 1024
+											}
+										}
+									}}
+									value={$values[setting.key].max_indexed_job_log_size / 1024}
+								/>
+							</div>
+							<h3>Service Logs Index</h3>
+							<div>
+								<label for="commit_log_max_batch_size" class="block text-sm font-medium"
+									>Commit max batch size <Tooltip>
+										The max amount of documents per commit. In this case 1 document is one log file
+										representing all logs during 1 minute for a specific host. To optimize indexing
+										throughput, it is best to keep this as high as possible. However, especially
+										when reindexing the whole instance, it can be useful to have a limit on how many
+										logs can be written without being commited. A commit will make the logs
+										available for search, appear as a log line, and be a "checkpoint" of the
+										indexing progress.
+									</Tooltip>
+								</label>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="commit_log_max_batch_size"
+									placeholder="10000"
+									bind:value={$values[setting.key].commit_log_max_batch_size}
+								/>
+							</div>
+							<div>
+								<label for="refresh_log_index_period" class="block text-sm font-medium">
+									Refresh index period (s) <Tooltip>
+										The index will query new service logs peridically and write them on the index.
+										This setting sets that period.
+									</Tooltip></label
+								>
+								<input
+									disabled={!$enterpriseLicense}
+									type="number"
+									id="refresh_log_index_period"
+									placeholder="300"
+									bind:value={$values[setting.key].refresh_log_index_period}
+								/>
+							</div>
+							<h3>Reset Index</h3>
+							This buttons will clear the whole index, and the service will start reindexing from scratch.
+							Full text search might be down during this time.
+							<div>
+								<ConfirmButton
+									on:click={async () => {
+										let r = await IndexSearchService.clearIndex({
+											idxName: 'JobIndex'
+										})
+										console.log('asasd')
+										sendUserToast(r)
+									}}>Clear <b>Jobs</b> Index</ConfirmButton
+								>
+								<ConfirmButton
+									on:click={async () => {
+										let r = await IndexSearchService.clearIndex({
+											idxName: 'ServiceLogIndex'
+										})
+										console.log('asasd')
+										sendUserToast(r)
+									}}>Clear <b>Service Logs</b> Index</ConfirmButton
+								>
+							</div>
+						{/if}
+					</div>
+				{:else if setting.fieldType == 'smtp_connect'}
+					<div class="flex flex-col gap-4 border rounded p-4">
+						{#if $values[setting.key]}
+							<div>
+								<label for="smtp_host" class="block text-sm font-medium">Host</label>
+								<input
+									type="text"
+									id="smtp_host"
+									placeholder="smtp.gmail.com"
+									bind:value={$values[setting.key].smtp_host}
+								/>
+							</div>
+							<div>
+								<label for="smtp_port" class="block text-sm font-medium">Port</label>
+								<input
+									type="number"
+									id="smtp_port"
+									placeholder="587"
+									bind:value={$values[setting.key].smtp_port}
+								/>
+							</div>
+							<div>
+								<label for="smtp_username" class="block text-sm font-medium">Username</label>
+								<input
+									type="text"
+									id="smtp_username"
+									placeholder="ruben@windmill.dev"
+									bind:value={$values[setting.key].smtp_username}
+								/>
+							</div>
+							<div>
+								<label for="smtp_password" class="block text-sm font-medium">Password</label>
+								<Password bind:password={$values[setting.key].smtp_password} />
+							</div>
+							<div>
+								<label for="smtp_from" class="block text-sm font-medium">From Address</label>
+								<input
+									type="email"
+									id="smtp_from"
+									placeholder="noreply@windmill.dev"
+									bind:value={$values[setting.key].smtp_from}
+								/>
+							</div>
+							<div>
+								<Toggle
+									disabled={$values[setting.key].smtp_disable_tls == true || !$enterpriseLicense}
+									id="smtp_tls_implicit"
+									bind:checked={$values[setting.key].smtp_tls_implicit}
+									options={{ right: 'Implicit TLS' }}
+									label="Implicit TLS"
+								/>
+							</div>
+							<div>
+								<Toggle
+									id="smtp_disable_tls"
+									disabled={!$enterpriseLicense}
+									bind:checked={$values[setting.key].smtp_disable_tls}
+									on:change={() => {
+										if ($values[setting.key].smtp_disable_tls) {
+											$values[setting.key].smtp_tls_implicit = false
+										}
+									}}
+									options={{ right: 'Disable TLS' }}
+									label="Disable TLS"
+								/>
+							</div>
+						{/if}
+					</div>
+				{:else if setting.fieldType == 'otel'}
+					<div class="flex flex-col gap-4 border rounded p-4">
+						{#if $values[setting.key]}
+							<div class="flex gap-8">
+								<Toggle
+									disabled={!$enterpriseLicense}
+									id="tracing_enabled"
+									bind:checked={$values[setting.key].tracing_enabled}
+									options={{ right: 'Tracing' }}
+									label="Tracing"
+								/>
+								<Toggle
+									disabled={!$enterpriseLicense}
+									id="logs_enabled"
+									bind:checked={$values[setting.key].logs_enabled}
+									options={{ right: 'Logs' }}
+									label="logs"
+								/>
+								<Toggle
+									disabled
+									id="metrics_enabled"
+									bind:checked={$values[setting.key].logs_enabled}
+									options={{ right: 'Metrics (coming soon)' }}
+									label="metrics"
+								/>
+							</div>
 
-						<div>
-							<label for="OTEL_EXPORTER_OTLP_ENDPOINT" class="block text-sm font-medium"
-								>Endpoint</label
-							>
-							<input
-								disabled={!$enterpriseLicense}
-								type="text"
-								id="OTEL_EXPORTER_OTLP_ENDPOINT"
-								placeholder="http://otel-collector.example.com:4317"
-								bind:value={$values[setting.key].otel_exporter_otlp_endpoint}
-							/>
-						</div>
-						<div>
-							<label for="OTEL_EXPORTER_OTLP_HEADERS" class="block text-sm font-medium"
-								>Headers</label
-							>
-							<input
-								disabled={!$enterpriseLicense}
-								type="text"
-								id="OTEL_EXPORTER_OTLP_HEADERS"
-								placeholder="Authorization=Bearer my-secret-token,Env=production"
-								bind:value={$values[setting.key].otel_exporter_otlp_headers}
-							/>
-						</div>
-						<div>
-							<label for="OTEL_EXPORTER_OTLP_PROTOCOL" class="block text-sm font-medium"
-								>Protocol</label
-							>
-							gRPC
-						</div>
-						<!-- <div>
+							<div>
+								<label for="OTEL_EXPORTER_OTLP_ENDPOINT" class="block text-sm font-medium"
+									>Endpoint</label
+								>
+								<input
+									disabled={!$enterpriseLicense}
+									type="text"
+									id="OTEL_EXPORTER_OTLP_ENDPOINT"
+									placeholder="http://otel-collector.example.com:4317"
+									bind:value={$values[setting.key].otel_exporter_otlp_endpoint}
+								/>
+							</div>
+							<div>
+								<label for="OTEL_EXPORTER_OTLP_HEADERS" class="block text-sm font-medium"
+									>Headers</label
+								>
+								<input
+									disabled={!$enterpriseLicense}
+									type="text"
+									id="OTEL_EXPORTER_OTLP_HEADERS"
+									placeholder="Authorization=Bearer my-secret-token,Env=production"
+									bind:value={$values[setting.key].otel_exporter_otlp_headers}
+								/>
+							</div>
+							<div>
+								<label for="OTEL_EXPORTER_OTLP_PROTOCOL" class="block text-sm font-medium"
+									>Protocol</label
+								>
+								gRPC
+							</div>
+							<!-- <div>
 							<label for="OTEL_EXPORTER_OTLP_PROTOCOL" class="block text-sm font-medium"
 								>Protocol<span class="text-2xs text-tertiary ml-4"
 									>grpc, http/protobuf, http/json</span
@@ -874,46 +888,49 @@
 								bind:value={$values[setting.key].otel_exporter_otlp_compression}
 							/>
 						</div> -->
-					{/if}
-				</div>
-			{:else if setting.fieldType == 'object_store_config'}
-				<ObjectStoreConfigSettings bind:bucket_config={$values[setting.key]} />
-				<div class="mb-6" />
-			{:else if setting.fieldType == 'number'}
-				<input type="number" placeholder={setting.placeholder} bind:value={$values[setting.key]} />
-			{:else if setting.fieldType == 'password'}
-				<input
-					autocomplete="new-password"
-					type="password"
-					placeholder={setting.placeholder}
-					bind:value={$values[setting.key]}
-				/>
-			{:else if setting.fieldType == 'boolean'}
-				<div class="mt-0.5">
-					<Toggle
-						disabled={setting.ee_only != undefined && !$enterpriseLicense}
-						bind:checked={$values[setting.key]}
+						{/if}
+					</div>
+				{:else if setting.fieldType == 'object_store_config'}
+					<ObjectStoreConfigSettings bind:bucket_config={$values[setting.key]} />
+					<div class="mb-6" />
+				{:else if setting.fieldType == 'number'}
+					<input
+						type="number"
+						placeholder={setting.placeholder}
+						bind:value={$values[setting.key]}
 					/>
-				</div>
-			{:else if setting.fieldType == 'seconds'}
-				<div>
-					<SecondsInput
-						max={setting.ee_only != undefined && !$enterpriseLicense
-							? 60 * 60 * 24 * 30
-							: undefined}
-						bind:seconds={$values[setting.key]}
+				{:else if setting.fieldType == 'password'}
+					<input
+						autocomplete="new-password"
+						type="password"
+						placeholder={setting.placeholder}
+						bind:value={$values[setting.key]}
 					/>
-				</div>
-			{:else if setting.fieldType == 'select'}
+				{:else if setting.fieldType == 'boolean'}
+					<div class="mt-0.5">
+						<Toggle
+							disabled={setting.ee_only != undefined && !$enterpriseLicense}
+							bind:checked={$values[setting.key]}
+						/>
+					</div>
+				{:else if setting.fieldType == 'seconds'}
+					<div>
+						<SecondsInput
+							max={setting.ee_only != undefined && !$enterpriseLicense
+								? 60 * 60 * 24 * 30
+								: undefined}
+							bind:seconds={$values[setting.key]}
+						/>
+					</div>
+				{:else if setting.fieldType == 'select'}{/if}
+				{#if hasError}
+					<span class="text-red-500 dark:text-red-400 text-sm">
+						{setting.error ?? ''}
+					</span>
+				{/if}
+			{:else}
+				<input disabled placeholder="Loading..." />
 			{/if}
-			{#if hasError}
-				<span class="text-red-500 dark:text-red-400 text-sm">
-					{setting.error ?? ''}
-				</span>
-			{/if}
-		{:else}
-			<input disabled placeholder="Loading..." />
-		{/if}
-	</label>
+		</label>
 	{/if}
 {/if}
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 399b6f8a68..ef91c8400a 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -58,8 +58,8 @@
 		initialValues = Object.fromEntries(
 			(
 				await Promise.all(
-					Object.entries(settings).map(
-						async ([_, y]) =>
+					[...Object.values(settings), scimSamlSetting].map(
+						async (y) =>
 							await Promise.all(y.map(async (x) => [x.key, await getValue(x.key, x.storage)]))
 					)
 				)
@@ -134,7 +134,9 @@
 
 		let shouldReloadPage = false
 		if ($values) {
-			const allSettings = Object.values(settings).flatMap((x) => Object.entries(x))
+			const allSettings = [...Object.values(settings), scimSamlSetting].flatMap((x) =>
+				Object.entries(x)
+			)
 			let licenseKeySet = false
 			await Promise.all(
 				allSettings