diff --git a/frontend/src/routes/settings/admin/application-configuration/forms/app-config-ldap-form.svelte b/frontend/src/routes/settings/admin/application-configuration/forms/app-config-ldap-form.svelte
index f848938c..5d096ace 100644
--- a/frontend/src/routes/settings/admin/application-configuration/forms/app-config-ldap-form.svelte
+++ b/frontend/src/routes/settings/admin/application-configuration/forms/app-config-ldap-form.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import SwitchWithLabel from '$lib/components/form/switch-with-label.svelte';
 	import FormInput from '$lib/components/form/form-input.svelte';
+	import SwitchWithLabel from '$lib/components/form/switch-with-label.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import { m } from '$lib/paraglide/messages';
 	import AppConfigService from '$lib/services/app-config-service';
@@ -25,28 +25,6 @@
 	let ldapEnabled = $state(appConfig.ldapEnabled);
 	let ldapSyncing = $state(false);
 
-	const updatedAppConfig = {
-		ldapEnabled: appConfig.ldapEnabled,
-		ldapUrl: appConfig.ldapUrl,
-		ldapBindDn: appConfig.ldapBindDn,
-		ldapBindPassword: appConfig.ldapBindPassword,
-		ldapBase: appConfig.ldapBase,
-		ldapUserSearchFilter: appConfig.ldapUserSearchFilter,
-		ldapUserGroupSearchFilter: appConfig.ldapUserGroupSearchFilter,
-		ldapSkipCertVerify: appConfig.ldapSkipCertVerify,
-		ldapAttributeUserUniqueIdentifier: appConfig.ldapAttributeUserUniqueIdentifier,
-		ldapAttributeUserUsername: appConfig.ldapAttributeUserUsername,
-		ldapAttributeUserEmail: appConfig.ldapAttributeUserEmail,
-		ldapAttributeUserFirstName: appConfig.ldapAttributeUserFirstName,
-		ldapAttributeUserLastName: appConfig.ldapAttributeUserLastName,
-		ldapAttributeUserProfilePicture: appConfig.ldapAttributeUserProfilePicture,
-		ldapAttributeGroupMember: appConfig.ldapAttributeGroupMember,
-		ldapAttributeGroupUniqueIdentifier: appConfig.ldapAttributeGroupUniqueIdentifier,
-		ldapAttributeGroupName: appConfig.ldapAttributeGroupName,
-		ldapAttributeAdminGroup: appConfig.ldapAttributeAdminGroup,
-		ldapSoftDeleteUsers: appConfig.ldapSoftDeleteUsers || true
-	};
-
 	const formSchema = z.object({
 		ldapUrl: z.url(),
 		ldapBindDn: z.string().min(1),
diff --git a/frontend/src/routes/settings/admin/application-configuration/forms/app-config-signup-defaults-form.svelte b/frontend/src/routes/settings/admin/application-configuration/forms/app-config-signup-defaults-form.svelte
index f2e56c29..ad4c0bde 100644
--- a/frontend/src/routes/settings/admin/application-configuration/forms/app-config-signup-defaults-form.svelte
+++ b/frontend/src/routes/settings/admin/application-configuration/forms/app-config-signup-defaults-form.svelte
@@ -6,6 +6,7 @@
 	import * as Select from '$lib/components/ui/select';
 	import { m } from '$lib/paraglide/messages';
 	import UserGroupService from '$lib/services/user-group-service';
+	import appConfigStore from '$lib/stores/application-configuration-store';
 	import type { AllAppConfig } from '$lib/types/application-configuration';
 	import { debounced } from '$lib/utils/debounce-util';
 	import { preventDefault } from '$lib/utils/event-util';
@@ -95,82 +96,84 @@
 	onMount(() => loadUserGroups());
 </script>
 
-<form class="space-y-6" onsubmit={preventDefault(onSubmit)}>
-	<div class="grid gap-2">
-		<div>
-			<Label class="mb-0" for="enable-user-signup">{m.enable_user_signups()}</Label>
-			<p class="text-muted-foreground text-[0.8rem]">
-				{m.enable_user_signups_description()}
-			</p>
-		</div>
-		<Select.Root
-			type="single"
-			value={allowUserSignups}
-			onValueChange={(v) => (allowUserSignups = v as typeof allowUserSignups)}
-		>
-			<Select.Trigger
-				id="enable-user-signup"
-				class="w-full"
-				aria-label={m.enable_user_signups()}
-				placeholder={m.enable_user_signups()}
+<form onsubmit={preventDefault(onSubmit)}>
+	<fieldset class="flex flex-col gap-5" disabled={$appConfigStore.uiConfigDisabled}>
+		<div class="grid gap-2">
+			<div>
+				<Label class="mb-0" for="enable-user-signup">{m.enable_user_signups()}</Label>
+				<p class="text-muted-foreground text-[0.8rem]">
+					{m.enable_user_signups_description()}
+				</p>
+			</div>
+			<Select.Root
+				type="single"
+				value={allowUserSignups}
+				onValueChange={(v) => (allowUserSignups = v as typeof allowUserSignups)}
 			>
-				{signupOptions[allowUserSignups]?.label}
-			</Select.Trigger>
-			<Select.Content>
-				<Select.Item value="disabled">
-					<div class="flex flex-col items-start gap-1">
-						<span class="font-medium">{signupOptions.disabled.label}</span>
-						<span class="text-muted-foreground text-xs">
-							{signupOptions.disabled.description}
-						</span>
-					</div>
-				</Select.Item>
-				<Select.Item value="withToken">
-					<div class="flex flex-col items-start gap-1">
-						<span class="font-medium">{signupOptions.withToken.label}</span>
-						<span class="text-muted-foreground text-xs">
-							{signupOptions.withToken.description}
-						</span>
-					</div>
-				</Select.Item>
-				<Select.Item value="open">
-					<div class="flex flex-col items-start gap-1">
-						<span class="font-medium">{signupOptions.open.label}</span>
-						<span class="text-muted-foreground text-xs">
-							{signupOptions.open.description}
-						</span>
-					</div>
-				</Select.Item>
-			</Select.Content>
-		</Select.Root>
-	</div>
+				<Select.Trigger
+					id="enable-user-signup"
+					class="w-full"
+					aria-label={m.enable_user_signups()}
+					placeholder={m.enable_user_signups()}
+				>
+					{signupOptions[allowUserSignups]?.label}
+				</Select.Trigger>
+				<Select.Content>
+					<Select.Item value="disabled">
+						<div class="flex flex-col items-start gap-1">
+							<span class="font-medium">{signupOptions.disabled.label}</span>
+							<span class="text-muted-foreground text-xs">
+								{signupOptions.disabled.description}
+							</span>
+						</div>
+					</Select.Item>
+					<Select.Item value="withToken">
+						<div class="flex flex-col items-start gap-1">
+							<span class="font-medium">{signupOptions.withToken.label}</span>
+							<span class="text-muted-foreground text-xs">
+								{signupOptions.withToken.description}
+							</span>
+						</div>
+					</Select.Item>
+					<Select.Item value="open">
+						<div class="flex flex-col items-start gap-1">
+							<span class="font-medium">{signupOptions.open.label}</span>
+							<span class="text-muted-foreground text-xs">
+								{signupOptions.open.description}
+							</span>
+						</div>
+					</Select.Item>
+				</Select.Content>
+			</Select.Root>
+		</div>
 
-	<div>
-		<Label for="default-groups" class="mb-0">{m.user_groups()}</Label>
-		<p class="text-muted-foreground mt-1 mb-2 text-xs">
-			{m.user_creation_groups_description()}
-		</p>
-		<SearchableMultiSelect
-			id="default-groups"
-			items={userGroups}
-			oninput={(e) => onUserGroupSearch(e.currentTarget.value)}
-			selectedItems={selectedGroups.map((g) => g.value)}
-			onSelect={(selected) => {
-				selectedGroups = userGroups.filter((g) => selected.includes(g.value));
-			}}
-			isLoading={isUserSearchLoading}
-			disableInternalSearch
-		/>
-	</div>
-	<div>
-		<Label class="mb-0">{m.custom_claims()}</Label>
-		<p class="text-muted-foreground mt-1 mb-2 text-xs">
-			{m.user_creation_claims_description()}
-		</p>
-		<CustomClaimsInput bind:customClaims />
-	</div>
+		<div>
+			<Label for="default-groups" class="mb-0">{m.user_groups()}</Label>
+			<p class="text-muted-foreground mt-1 mb-2 text-xs">
+				{m.user_creation_groups_description()}
+			</p>
+			<SearchableMultiSelect
+				id="default-groups"
+				items={userGroups}
+				oninput={(e) => onUserGroupSearch(e.currentTarget.value)}
+				selectedItems={selectedGroups.map((g) => g.value)}
+				onSelect={(selected) => {
+					selectedGroups = userGroups.filter((g) => selected.includes(g.value));
+				}}
+				isLoading={isUserSearchLoading}
+				disableInternalSearch
+			/>
+		</div>
+		<div>
+			<Label class="mb-0">{m.custom_claims()}</Label>
+			<p class="text-muted-foreground mt-1 mb-2 text-xs">
+				{m.user_creation_claims_description()}
+			</p>
+			<CustomClaimsInput bind:customClaims />
+		</div>
 
-	<div class="flex justify-end pt-2">
-		<Button {isLoading} type="submit">{m.save()}</Button>
-	</div>
+		<div class="flex justify-end pt-2">
+			<Button {isLoading} type="submit">{m.save()}</Button>
+		</div>
+	</fieldset>
 </form>