diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl
index 4f7eedb610..393f227997 100644
--- a/src/views/admin/development/logger.tpl
+++ b/src/views/admin/development/logger.tpl
@@ -20,13 +20,13 @@
 
 		<form>
 			<div class="form-check form-switch mb-3">
-				<input class="form-check-input" type="checkbox" data-field="loggerStatus">
-				<label class="form-check-label">[[admin/development/logger:enable-http]]</label>
+				<input class="form-check-input" type="checkbox" id="loggerStatus" data-field="loggerStatus">
+				<label for="loggerStatus" class="form-check-label">[[admin/development/logger:enable-http]]</label>
 			</div>
 
 			<div class="form-check form-switch mb-3">
-				<input class="form-check-input" type="checkbox" data-field="loggerIOStatus">
-				<label class="form-check-label">[[admin/development/logger:enable-socket]]</label>
+				<input class="form-check-input" type="checkbox" id="loggerIOStatus" data-field="loggerIOStatus">
+				<label for="loggerIOStatus" class="form-check-label">[[admin/development/logger:enable-socket]]</label>
 			</div>
 
 			<label class="form-label" for="loggerPath">[[admin/development/logger:file-path]]</label>
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 9da7e1b079..fb2afcedec 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -78,16 +78,16 @@
 
 				<div class="mb-3">
 					<div class="form-check form-switch">
-						<input type="checkbox" class="form-check-input" id="cid-{category.cid}-isSection" data-name="isSection" {{{ if category.isSection }}}checked{{{ end }}} />
-						<label class="form-check-label">[[admin/manage/categories:is-section]]</label>
+						<input type="checkbox" class="form-check-input" id="cid-isSection" data-name="isSection" {{{ if category.isSection }}}checked{{{ end }}} />
+						<label for="cid-isSection" class="form-check-label">[[admin/manage/categories:is-section]]</label>
 					</div>
 				</div>
 
 				{{{ if postQueueEnabled }}}
 				<div class="mb-3">
 					<div class="form-check form-switch">
-						<input type="checkbox" class="form-check-input" data-name="postQueue" {{{ if category.postQueue }}}checked{{{ end }}} />
-						<label class="form-check-label">[[admin/manage/categories:post-queue]]</label>
+						<input type="checkbox" class="form-check-input" id="postQueue" data-name="postQueue" {{{ if category.postQueue }}}checked{{{ end }}} />
+						<label for="postQueue" class="form-check-label">[[admin/manage/categories:post-queue]]</label>
 					</div>
 				</div>
 				{{{ end }}}
diff --git a/src/views/admin/partials/categories/copy-settings.tpl b/src/views/admin/partials/categories/copy-settings.tpl
index b17b4264c7..73ebb27f0c 100644
--- a/src/views/admin/partials/categories/copy-settings.tpl
+++ b/src/views/admin/partials/categories/copy-settings.tpl
@@ -1,7 +1,7 @@
 <!-- IMPORT admin/partials/categories/select-category.tpl -->
 <div class="mt-3">
-    <label class="form-label" for="copyParent">
+    <div class="form-check">
         <input id="copyParent" name="copyParent" type="checkbox" class="form-check-input">
-        <strong>[[admin/manage/categories:copy-parent]]</strong>
-    </label>
+        <label for="copyParent" class="form-check-label">[[admin/manage/categories:copy-parent]]</label>
+    </div>
 </div>
\ No newline at end of file
diff --git a/src/views/admin/partials/categories/create.tpl b/src/views/admin/partials/categories/create.tpl
index b4c7e759c8..2158cab43f 100644
--- a/src/views/admin/partials/categories/create.tpl
+++ b/src/views/admin/partials/categories/create.tpl
@@ -16,14 +16,14 @@
 		</div>
 		<div class="form-check form-switch">
 			<input class="form-check-input "id="cloneChildren" name="cloneChildren" type="checkbox">
-			<label class="form-check-label">[[admin/manage/categories:clone-children]]</label>
+			<label for="cloneChildren" class="form-check-label">[[admin/manage/categories:clone-children]]</label>
 		</div>
 	</div>
 
 	<div class="mb-3">
 		<div class="form-check form-switch">
 			<input class="form-check-input "id="disabled" name="disabled" type="checkbox">
-			<label class="form-check-label">[[admin/manage/categories:disable-on-create]]</label>
+			<label for="disabled" class="form-check-label">[[admin/manage/categories:disable-on-create]]</label>
 		</div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index fc3fcc4b8f..049942b2ee 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -7,8 +7,8 @@
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/advanced:maintenance-mode]]</h5>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="maintenanceMode">
-					<label class="form-check-label">[[admin/settings/advanced:maintenance-mode]]</label>
+					<input class="form-check-input" type="checkbox" id="maintenanceMode" data-field="maintenanceMode">
+					<label for="maintenanceMode" class="form-check-label">[[admin/settings/advanced:maintenance-mode]]</label>
 				</div>
 				<p class="form-text">
 					[[admin/settings/advanced:maintenance-mode.help]]
@@ -75,7 +75,7 @@
 				</div>
 				<div class="form-check form-switch mb-3">
 					<input class="form-check-input" type="checkbox" data-field="cross-origin-embedder-policy" id="cross-origin-embedder-policy">
-					<label class="form-check-label">[[admin/settings/advanced:headers.coep]]</label>
+					<label for="cross-origin-embedder-policy" class="form-check-label">[[admin/settings/advanced:headers.coep]]</label>
 				</div>
 				<p class="form-text">[[admin/settings/advanced:headers.coep-help]]</p>
 				<div class="mb-3">
@@ -108,20 +108,20 @@
 			<div id="strict-transport-security" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/advanced:hsts]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="hsts-enabled" checked>
-					<label class="form-check-label">[[admin/settings/advanced:hsts.enabled]]</label>
+					<input class="form-check-input" type="checkbox" id="hsts-enabled" data-field="hsts-enabled" checked>
+					<label for="hsts-enabled" class="form-check-label">[[admin/settings/advanced:hsts.enabled]]</label>
 				</div>
 				<div class="mb-3">
 					<label class="form-label" for="hsts-maxage">[[admin/settings/advanced:hsts.maxAge]]</label>
 					<input class="form-control" id="hsts-maxage" type="number" placeholder="31536000" data-field="hsts-maxage" />
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="hsts-subdomains" checked>
-					<label class="form-check-label">[[admin/settings/advanced:hsts.subdomains]]</label>
+					<input class="form-check-input" type="checkbox" id="hsts-subdomains" data-field="hsts-subdomains" checked>
+					<label for="hsts-subdomains" class="form-check-label">[[admin/settings/advanced:hsts.subdomains]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="hsts-preload">
-					<label class="form-check-label">[[admin/settings/advanced:hsts.preload]]</label>
+					<input class="form-check-input" type="checkbox" id="hsts-preload" data-field="hsts-preload">
+					<label for="hsts-preload" class="form-check-label">[[admin/settings/advanced:hsts.preload]]</label>
 				</div>
 				<p class="form-text">
 					[[admin/settings/advanced:hsts.help, https:\/\/hstspreload.org\/]]
@@ -168,8 +168,8 @@
 						[[admin/settings/advanced:compression.help]]
 					</p>
 					<div class="form-check form-switch">
-						<input class="form-check-input" type="checkbox" data-field="useCompression">
-						<label class="form-check-label">[[admin/settings/advanced:compression.enable]]</label>
+						<input class="form-check-input" type="checkbox" id="useCompression" data-field="useCompression">
+						<label for="useCompression" class="form-check-label">[[admin/settings/advanced:compression.enable]]</label>
 					</div>
 				</div>
 			</div>
diff --git a/src/views/admin/settings/api.tpl b/src/views/admin/settings/api.tpl
index 3fff449d70..c5e9e27ce3 100644
--- a/src/views/admin/settings/api.tpl
+++ b/src/views/admin/settings/api.tpl
@@ -26,8 +26,8 @@
 
 	<div class="mb-3">
 		<div class="form-check form-switch mb-3">
-			<input id="requireHttps" class="form-check-input" type="checkbox" name="requireHttps" />
-			<label class="form-check-label">[[admin/settings/api:require-https]]</label>
+			<input id="requireHttps" class="form-check-input" type="checkbox" id="requireHttps" name="requireHttps" />
+			<label for="requireHttps" class="form-check-label">[[admin/settings/api:require-https]]</label>
 			<p class="form-text">[[admin/settings/api:require-https-caveat]]</p>
 		</div>
 	</div>
diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl
index 18e073e2ec..59a32445bd 100644
--- a/src/views/admin/settings/chat.tpl
+++ b/src/views/admin/settings/chat.tpl
@@ -9,14 +9,14 @@
 				<div class="mb-3">
 					<div class="form-check form-switch">
 						<input type="checkbox" class="form-check-input" id="disableChat" data-field="disableChat">
-						<label class="form-check-label">[[admin/settings/chat:disable]]</label>
+						<label for="disableChat" class="form-check-label">[[admin/settings/chat:disable]]</label>
 					</div>
 				</div>
 
 				<div class="mb-3">
 					<div class="form-check form-switch">
 						<input type="checkbox" class="form-check-input" id="disableChatMessageEditing" data-field="disableChatMessageEditing">
-						<label class="form-check-label">[[admin/settings/chat:disable-editing]]</label>
+						<label for="disableChatMessageEditing" class="form-check-label">[[admin/settings/chat:disable-editing]]</label>
 					</div>
 					<p class="form-text">[[admin/settings/chat:disable-editing-help]]</p>
 				</div>
diff --git a/src/views/admin/settings/cookies.tpl b/src/views/admin/settings/cookies.tpl
index 56d3abb832..e7c5fa6e70 100644
--- a/src/views/admin/settings/cookies.tpl
+++ b/src/views/admin/settings/cookies.tpl
@@ -8,7 +8,7 @@
 				<div class="mb-3">
 					<div class="form-check form-switch">
 						<input type="checkbox" class="form-check-input" id="cookieConsentEnabled" data-field="cookieConsentEnabled">
-						<label class="form-check-label">[[admin/settings/cookies:consent.enabled]]</label>
+						<label for="cookieConsentEnabled" class="form-check-label">[[admin/settings/cookies:consent.enabled]]</label>
 					</div>
 				</div>
 				<div class="mb-3">
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index bf3d79ded3..7092fab2be 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -181,8 +181,8 @@
 							</div>
 
 							<div class="form-check form-switch mb-3">
-								<input class="form-check-input" type="checkbox" data-field="allowUserHomePage">
-								<label class="form-check-label">[[admin/settings/homepage:allow-user-home-pages]]</label>
+								<input class="form-check-input" type="checkbox" id="allowUserHomePage" data-field="allowUserHomePage">
+								<label for="allowUserHomePage" class="form-check-label">[[admin/settings/homepage:allow-user-home-pages]]</label>
 							</div>
 							<div>
 								<label class="form-label" for="homePageTitle">[[admin/settings/homepage:home-page-title]]</label>
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 26fcf37a27..2d3f960007 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -6,15 +6,15 @@
 			<div id="general" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/group:general]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="allowPrivateGroups">
-					<label class="form-check-label">[[admin/settings/group:private-groups]]</label>
+					<input class="form-check-input" type="checkbox" id="allowPrivateGroups" data-field="allowPrivateGroups">
+					<label for="allowPrivateGroups" class="form-check-label">[[admin/settings/group:private-groups]]</label>
 					<p class="form-text">[[admin/settings/group:private-groups.help]]</p>
 					<p class="form-text">[[admin/settings/group:private-groups.warning]]</p>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="allowMultipleBadges">
-					<label class="form-check-label">[[admin/settings/group:allow-multiple-badges]]</label>
+					<input class="form-check-input" type="checkbox" id="allowMultipleBadges" data-field="allowMultipleBadges">
+					<label for="allowMultipleBadges" class="form-check-label">[[admin/settings/group:allow-multiple-badges]]</label>
 					<p class="form-text">[[admin/settings/group:allow-multiple-badges-help]]</p>
 				</div>
 
diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl
index 8c438200cb..431b052361 100644
--- a/src/views/admin/settings/navigation.tpl
+++ b/src/views/admin/settings/navigation.tpl
@@ -86,13 +86,13 @@
 						</div>
 
 						<div class="form-check form-switch mb-3">
-							<input class="form-check-input" type="checkbox" name="targetBlank" {{{ if enabled.targetBlank }}}checked{{{ end }}}/>
-							<label class="form-check-label">[[admin/settings/navigation:open-new-window]]</label>
+							<input class="form-check-input" type="checkbox" id="targetBlank-{./index}" name="targetBlank" {{{ if enabled.targetBlank }}}checked{{{ end }}}/>
+							<label for="targetBlank-{./index}" class="form-check-label">[[admin/settings/navigation:open-new-window]]</label>
 						</div>
 
 						<div class="form-check form-switch mb-3">
-							<input class="form-check-input" type="checkbox" name="dropdown" {{{ if enabled.dropdown }}}checked{{{ end }}}/>
-							<label class="form-check-label">[[admin/settings/navigation:dropdown]]</label>
+							<input class="form-check-input" type="checkbox" id="dropdown-{./index}" name="dropdown" {{{ if enabled.dropdown }}}checked{{{ end }}}/>
+							<label for="dropdown-{./index}" class="form-check-label">[[admin/settings/navigation:dropdown]]</label>
 						</div>
 						<div class="mb-3">
 							<p class="form-text">
diff --git a/src/views/admin/settings/pagination.tpl b/src/views/admin/settings/pagination.tpl
index 93d8aec911..4a510ae18f 100644
--- a/src/views/admin/settings/pagination.tpl
+++ b/src/views/admin/settings/pagination.tpl
@@ -6,8 +6,8 @@
 			<div id="pagination" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header hidden">[[admin/settings/pagination:pagination]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="usePagination">
-					<label class="form-check-label">[[admin/settings/pagination:enable]]</label>
+					<input class="form-check-input" type="checkbox" id="usePagination" data-field="usePagination">
+					<label for="usePagination" class="form-check-label">[[admin/settings/pagination:enable]]</label>
 				</div>
 
 				<div class="mb-3">
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index 6f7a5c8241..816dfabede 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -30,14 +30,14 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="topicBacklinks">
-					<label class="form-check-label">[[admin/settings/post:backlinks.enabled]]</label>
+					<input class="form-check-input" type="checkbox" id="topicBacklinks" data-field="topicBacklinks">
+					<label for="topicBacklinks" class="form-check-label">[[admin/settings/post:backlinks.enabled]]</label>
 					<p class="form-text">[[admin/settings/post:backlinks.help]]</p>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="trackIpPerPost">
-					<label class="form-check-label">[[admin/settings/post:ip-tracking.each-post]]</label>
+					<input id="trackIPPerPost" class="form-check-input" type="checkbox" data-field="trackIpPerPost">
+					<label for="trackIPPerPost" class="form-check-label">[[admin/settings/post:ip-tracking.each-post]]</label>
 				</div>
 
 				<div class="mb-3">
@@ -49,8 +49,8 @@
 					</select>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="showPostPreviewsOnHover">
-					<label class="form-check-label">[[admin/settings/post:showPostPreviewsOnHover]]</label>
+					<input class="form-check-input" type="checkbox" id="showPostPreviewsOnHover" data-field="showPostPreviewsOnHover">
+					<label for="showPostPreviewsOnHover" class="form-check-label">[[admin/settings/post:showPostPreviewsOnHover]]</label>
 				</div>
 			</div>
 
@@ -234,20 +234,20 @@
 			<div id="signature-settings" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/post:signature]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="disableSignatures">
-					<label class="form-check-label">[[admin/settings/post:signature.disable]]</label>
+					<input class="form-check-input" type="checkbox" id="disableSignatures" data-field="disableSignatures">
+					<label for="disableSignatures" class="form-check-label">[[admin/settings/post:signature.disable]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="signatures:disableLinks">
-					<label class="form-check-label">[[admin/settings/post:signature.no-links]]</label>
+					<input class="form-check-input" type="checkbox" id="signatures:disableLinks" data-field="signatures:disableLinks">
+					<label for="signatures:disableLinks" class="form-check-label">[[admin/settings/post:signature.no-links]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="signatures:disableImages">
-					<label class="form-check-label">[[admin/settings/post:signature.no-images]]</label>
+					<input class="form-check-input" type="checkbox" id="signatures:disableImages" data-field="signatures:disableImages">
+					<label for="signatures:disableImages" class="form-check-label">[[admin/settings/post:signature.no-images]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="signatures:hideDuplicates">
-					<label class="form-check-label">[[admin/settings/post:signature.hide-duplicates]]</label>
+					<input class="form-check-input" type="checkbox" id="signatures:hideDuplicates" data-field="signatures:hideDuplicates">
+					<label for="signatures:hideDuplicates" class="form-check-label">[[admin/settings/post:signature.hide-duplicates]]</label>
 				</div>
 				<div>
 					<label class="form-label" for="maximumSignatureLength">[[admin/settings/post:signature.max-length]]</label>
diff --git a/src/views/admin/settings/reputation.tpl b/src/views/admin/settings/reputation.tpl
index a2fea06559..6f5796170e 100644
--- a/src/views/admin/settings/reputation.tpl
+++ b/src/views/admin/settings/reputation.tpl
@@ -7,16 +7,16 @@
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/reputation:reputation]]</h5>
 
 				<div class="form-check form-switch mb-3">
-					<input type="checkbox" class="form-check-input" data-field="reputation:disabled">
-					<label class="form-check-label">[[admin/settings/reputation:disable]]</label>
+					<input type="checkbox" class="form-check-input" id="reputation:disabled" data-field="reputation:disabled">
+					<label for="reputation:disabled" class="form-check-label">[[admin/settings/reputation:disable]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input type="checkbox" class="form-check-input" data-field="downvote:disabled">
-					<label class="form-check-label">[[admin/settings/reputation:disable-down-voting]]</label>
+					<input type="checkbox" class="form-check-input" id="downvote:disabled" data-field="downvote:disabled">
+					<label for="downvote:disabled" class="form-check-label">[[admin/settings/reputation:disable-down-voting]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input type="checkbox" class="form-check-input" data-field="votesArePublic">
-					<label class="form-check-label">[[admin/settings/reputation:votes-are-public]]</label>
+					<input type="checkbox" class="form-check-input" id="votesArePublic" data-field="votesArePublic">
+					<label for="votesArePublic" class="form-check-label">[[admin/settings/reputation:votes-are-public]]</label>
 				</div>
 			</div>
 
@@ -112,8 +112,8 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input type="checkbox" class="form-check-input" data-field="flags:autoResolveOnBan">
-					<label class="form-check-label">[[admin/settings/reputation:flags.auto-resolve-on-ban]]</label>
+					<input type="checkbox" class="form-check-input" id="flags:autoResolveOnBan" data-field="flags:autoResolveOnBan">
+					<label for="flags:autoResolveOnBan" class="form-check-label">[[admin/settings/reputation:flags.auto-resolve-on-ban]]</label>
 				</div>
 			</div>
 		</div>
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index 88869f3418..58da4e3ff6 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -7,13 +7,13 @@
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/uploads:posts]]</h5>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="stripEXIFData">
-					<label class="form-check-label">[[admin/settings/uploads:strip-exif-data]]</label>
+					<input class="form-check-input" type="checkbox" id="stripEXIFData" data-field="stripEXIFData">
+					<label for="stripEXIFData" class="form-check-label">[[admin/settings/uploads:strip-exif-data]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="privateUploads">
-					<label class="form-check-label">[[admin/settings/uploads:private]]</label>
+					<input class="form-check-input" type="checkbox" id="privateUploads" data-field="privateUploads">
+					<label for="privateUploads" class="form-check-label">[[admin/settings/uploads:private]]</label>
 				</div>
 
 				<div class="mb-3">
@@ -79,8 +79,8 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="allowTopicsThumbnail">
-					<label class="form-check-label">[[admin/settings/uploads:allow-topic-thumbnails]]</label>
+					<input class="form-check-input" type="checkbox" id="allowTopicsThumbnail" data-field="allowTopicsThumbnail">
+					<label for="allowTopicsThumbnail" class="form-check-label">[[admin/settings/uploads:allow-topic-thumbnails]]</label>
 				</div>
 
 				<div class="mb-3">
@@ -119,8 +119,8 @@
 			<div id="orphaned-files" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/uploads:orphans]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="preserveOrphanedUploads">
-					<label class="form-check-label">[[admin/settings/uploads:preserve-orphaned-uploads]]</label>
+					<input class="form-check-input" type="checkbox" id="preserveOrphanedUploads" data-field="preserveOrphanedUploads">
+					<label for="preserveOrphanedUploads" class="form-check-label">[[admin/settings/uploads:preserve-orphaned-uploads]]</label>
 				</div>
 
 				<div class="row">
@@ -139,13 +139,13 @@
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/uploads:profile-avatars]]</h5>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="allowProfileImageUploads">
-					<label class="form-check-label">[[admin/settings/uploads:allow-profile-image-uploads]]</label>
+					<input class="form-check-input" type="checkbox" id="allowProfileImageUploads" data-field="allowProfileImageUploads">
+					<label for="allowProfileImageUploads" class="form-check-label">[[admin/settings/uploads:allow-profile-image-uploads]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="profile:convertProfileImageToPNG">
-					<label class="form-check-label">[[admin/settings/uploads:convert-profile-image-png]]</label>
+					<input class="form-check-input" type="checkbox" id="profile:convertProfileImageToPNG" data-field="profile:convertProfileImageToPNG">
+					<label for="profile:convertProfileImageToPNG" class="form-check-label">[[admin/settings/uploads:convert-profile-image-png]]</label>
 				</div>
 
 				<div class="mb-3">
@@ -181,8 +181,8 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="profile:keepAllUserImages">
-					<label class="form-check-label">[[admin/settings/uploads:keep-all-user-images]]</label>
+					<input class="form-check-input" type="checkbox" id="profile:keepAllUserImages" data-field="profile:keepAllUserImages">
+					<label for="profile:keepAllUserImages" class="form-check-label">[[admin/settings/uploads:keep-all-user-images]]</label>
 				</div>
 
 			</div>
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl
index 86ef732cce..1871f9dd67 100644
--- a/src/views/admin/settings/user.tpl
+++ b/src/views/admin/settings/user.tpl
@@ -14,41 +14,41 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="gdpr_enabled">
-					<label class="form-check-label">[[admin/settings/user:gdpr_enabled]]</label>
+					<input class="form-check-input" type="checkbox" id="gdpr_enabled" data-field="gdpr_enabled">
+					<label for="gdpr_enabled" class="form-check-label">[[admin/settings/user:gdpr_enabled]]</label>
 					<p class="form-text">[[admin/settings/user:gdpr_enabled_help]]</p>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="username:disableEdit">
-					<label class="form-check-label">[[admin/settings/user:disable-username-changes]]</label>
+					<input class="form-check-input" type="checkbox" id="username:disableEdit" data-field="username:disableEdit">
+					<label for="username:disableEdit" class="form-check-label">[[admin/settings/user:disable-username-changes]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="email:disableEdit">
-					<label class="form-check-label">[[admin/settings/user:disable-email-changes]]</label>
+					<input class="form-check-input" type="checkbox" id="email:disableEdit" data-field="email:disableEdit">
+					<label for="email:disableEdit" class="form-check-label">[[admin/settings/user:disable-email-changes]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="password:disableEdit">
-					<label class="form-check-label">[[admin/settings/user:disable-password-changes]]</label>
+					<input class="form-check-input" type="checkbox" id="password:disableEdit" data-field="password:disableEdit">
+					<label for="password:disableEdit" class="form-check-label">[[admin/settings/user:disable-password-changes]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="allowAccountDelete" checked>
-					<label class="form-check-label">[[admin/settings/user:allow-account-deletion]]</label>
+					<input class="form-check-input" type="checkbox" id="allowAccountDelete" data-field="allowAccountDelete" checked>
+					<label for="allowAccountDelete" class="form-check-label">[[admin/settings/user:allow-account-deletion]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="hideFullname">
-					<label class="form-check-label">[[admin/settings/user:hide-fullname]]</label>
+					<input class="form-check-input" type="checkbox" id="hideFullname" data-field="hideFullname">
+					<label for="hideFullname" class="form-check-label">[[admin/settings/user:hide-fullname]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="hideEmail">
-					<label class="form-check-label">[[admin/settings/user:hide-email]]</label>
+					<input class="form-check-input" type="checkbox" id="hideEmail" data-field="hideEmail">
+					<label for="hideEmail" class="form-check-label">[[admin/settings/user:hide-email]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="showFullnameAsDisplayName">
-					<label class="form-check-label">[[admin/settings/user:show-fullname-as-displayname]]</label>
+					<input class="form-check-input" type="checkbox" id="showFullnameAsDisplayName" data-field="showFullnameAsDisplayName">
+					<label for="showFullnameAsDisplayName" class="form-check-label">[[admin/settings/user:show-fullname-as-displayname]]</label>
 				</div>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="disableCustomUserSkins">
-					<label class="form-check-label">[[admin/settings/user:disable-user-skins]]</label>
+					<input class="form-check-input" type="checkbox" id="disableCustomUserSkins" data-field="disableCustomUserSkins">
+					<label for="disableCustomUserSkins" class="form-check-label">[[admin/settings/user:disable-user-skins]]</label>
 				</div>
 			</div>
 
@@ -155,8 +155,8 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="showAverageApprovalTime">
-					<label class="form-check-label">[[admin/settings/user:registration-queue-show-average-time]]</label>
+					<input class="form-check-input" type="checkbox" id="showAverageApprovalTime" data-field="showAverageApprovalTime">
+					<label for="showAverageApprovalTime" class="form-check-label">[[admin/settings/user:registration-queue-show-average-time]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
@@ -218,8 +218,8 @@
 
 				<div class="mb-3">
 					<div class="form-check form-switch mb-3">
-						<input class="form-check-input" type="checkbox" data-field="allowGuestHandles">
-						<label class="form-check-label">[[admin/settings/guest:handles.enabled]]</label>
+						<input class="form-check-input" type="checkbox" id="allowGuestHandles" data-field="allowGuestHandles">
+						<label for="allowGuestHandles" class="form-check-label">[[admin/settings/guest:handles.enabled]]</label>
 					</div>
 					<p class="form-text">
 						[[admin/settings/guest:handles.enabled-help]]
@@ -227,14 +227,14 @@
 				</div>
 				<div class="mb-3">
 					<div class="form-check form-switch mb-3">
-						<input class="form-check-input" type="checkbox" data-field="guestsIncrementTopicViews">
-						<label class="form-check-label">[[admin/settings/guest:topic-views.enabled]]</label>
+						<input class="form-check-input" type="checkbox" id="guestsIncrementTopicViews" data-field="guestsIncrementTopicViews">
+						<label for="guestsIncrementTopicViews" class="form-check-label">[[admin/settings/guest:topic-views.enabled]]</label>
 					</div>
 				</div>
 				<div class="mb-3">
 					<div class="form-check form-switch mb-3">
-						<input class="form-check-input" type="checkbox" data-field="allowGuestReplyNotifications">
-						<label class="form-check-label">[[admin/settings/guest:reply-notifications.enabled]]</label>
+						<input class="form-check-input" type="checkbox" id="allowGuestReplyNotifications" data-field="allowGuestReplyNotifications">
+						<label for="allowGuestReplyNotifications" class="form-check-label">[[admin/settings/guest:reply-notifications.enabled]]</label>
 					</div>
 				</div>
 			</div>
@@ -244,33 +244,33 @@
 			<div id="default-user-settings" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/user:default-user-settings]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="showemail">
-					<label class="form-check-label">[[admin/settings/user:show-email]]</label>
+					<input class="form-check-input" type="checkbox" id="showemail" data-field="showemail">
+					<label for="showemail" class="form-check-label">[[admin/settings/user:show-email]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="showfullname">
-					<label class="form-check-label">[[admin/settings/user:show-fullname]]</label>
+					<input class="form-check-input" type="checkbox" id="showfullname" data-field="showfullname">
+					<label for="showfullname" class="form-check-label">[[admin/settings/user:show-fullname]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="restrictChat">
-					<label class="form-check-label">[[admin/settings/user:restrict-chat]]</label>
+					<input class="form-check-input" type="checkbox" id="restrictChat" data-field="restrictChat">
+					<label for="restrictChat" class="form-check-label">[[admin/settings/user:restrict-chat]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="openOutgoingLinksInNewTab">
-					<label class="form-check-label">[[admin/settings/user:outgoing-new-tab]]</label>
+					<input class="form-check-input" type="checkbox" id="openOutgoingLinksInNewTab" data-field="openOutgoingLinksInNewTab">
+					<label for="openOutgoingLinksInNewTab" class="form-check-label">[[admin/settings/user:outgoing-new-tab]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="topicSearchEnabled">
-					<label class="form-check-label">[[admin/settings/user:topic-search]]</label>
+					<input class="form-check-input" type="checkbox" id="topicSearchEnabled" data-field="topicSearchEnabled">
+					<label for="topicSearchEnabled" class="form-check-label">[[admin/settings/user:topic-search]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="updateUrlWithPostIndex">
-					<label class="form-check-label">[[admin/settings/user:update-url-with-post-index]]</label>
+					<input class="form-check-input" type="checkbox" id="updateUrlWithPostIndex" data-field="updateUrlWithPostIndex">
+					<label for="updateUrlWithPostIndex" class="form-check-label">[[admin/settings/user:update-url-with-post-index]]</label>
 				</div>
 
 				<div class="mb-3">
@@ -285,13 +285,13 @@
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="followTopicsOnCreate">
-					<label class="form-check-label">[[admin/settings/user:follow-created-topics]]</label>
+					<input class="form-check-input" type="checkbox" id="followTopicsOnCreate" data-field="followTopicsOnCreate">
+					<label for="followTopicsOnCreate" class="form-check-label">[[admin/settings/user:follow-created-topics]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="followTopicsOnReply">
-					<label class="form-check-label">[[admin/settings/user:follow-replied-topics]]</label>
+					<input class="form-check-input" type="checkbox" id="followTopicsOnReply" data-field="followTopicsOnReply">
+					<label for="followTopicsOnReply" class="form-check-label">[[admin/settings/user:follow-replied-topics]]</label>
 				</div>
 
 				<div class="mb-3">
diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl
index 8cdcd67702..ebb51d728d 100644
--- a/src/views/admin/settings/web-crawler.tpl
+++ b/src/views/admin/settings/web-crawler.tpl
@@ -16,13 +16,13 @@
 			<div id="sitemap-feed-settings" class="mb-4">
 				<h5 class="fw-bold tracking-tight settings-header">[[admin/settings/web-crawler:sitemap-feed-settings]]</h5>
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="feeds:disableRSS">
-					<label class="form-check-label">[[admin/settings/web-crawler:disable-rss-feeds]]</label>
+					<input class="form-check-input" type="checkbox" id="feeds:disableRSS" data-field="feeds:disableRSS">
+					<label for="feeds:disableRSS" class="form-check-label">[[admin/settings/web-crawler:disable-rss-feeds]]</label>
 				</div>
 
 				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" data-field="feeds:disableSitemap">
-					<label class="form-check-label">[[admin/settings/web-crawler:disable-sitemap-xml]]</label>
+					<input class="form-check-input" type="checkbox" id="feeds:disableSitemap" data-field="feeds:disableSitemap">
+					<label for="feeds:disableSitemap" class="form-check-label">[[admin/settings/web-crawler:disable-sitemap-xml]]</label>
 				</div>
 
 				<div class="mb-3">
diff --git a/src/views/modals/temporary-ban.tpl b/src/views/modals/temporary-ban.tpl
index 19b1047fed..d84bc28331 100644
--- a/src/views/modals/temporary-ban.tpl
+++ b/src/views/modals/temporary-ban.tpl
@@ -15,12 +15,12 @@
 				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 			<div class="form-check form-check-inline">
-				<label class="form-check-label">[[admin/manage/users:temp-ban.hours]]</label>
-				<input class="form-check-input" type="radio" name="unit" value="0" checked />
+				<label class="form-check-label" for="unit-hours">[[admin/manage/users:temp-ban.hours]]</label>
+				<input class="form-check-input" type="radio" id="unit-hours" name="unit" value="0" checked />
 			</div>
 			<div class="form-check form-check-inline">
-				<label class="form-check-label">[[admin/manage/users:temp-ban.days]]</label>
-				<input class="form-check-input" type="radio" name="unit" value="1" />
+				<label class="form-check-label" for="unit-days">[[admin/manage/users:temp-ban.days]]</label>
+				<input class="form-check-input" type="radio" id="unit-days" name="unit" value="1" />
 			</div>
 		</div>
 		<div class="col-7">
diff --git a/src/views/modals/temporary-mute.tpl b/src/views/modals/temporary-mute.tpl
index 87fab1890e..0025a909ee 100644
--- a/src/views/modals/temporary-mute.tpl
+++ b/src/views/modals/temporary-mute.tpl
@@ -6,12 +6,12 @@
 				<input class="form-control" id="length" name="length" type="number" min="0" value="1" />
 			</div>
 			<div class="form-check form-check-inline">
-				<label class="form-check-label">[[admin/manage/users:temp-ban.hours]]</label>
-				<input class="form-check-input" type="radio" name="unit" value="0" checked />
+				<label class="form-check-label" for="unit-hours">[[admin/manage/users:temp-ban.hours]]</label>
+				<input class="form-check-input" type="radio" id="unit-hours" name="unit" value="0" checked />
 			</div>
 			<div class="form-check form-check-inline">
-				<label class="form-check-label">[[admin/manage/users:temp-ban.days]]</label>
-				<input class="form-check-input" type="radio" name="unit" value="1" />
+				<label class="form-check-label" for="unit-days">[[admin/manage/users:temp-ban.days]]</label>
+				<input class="form-check-input" type="radio" id="unit-days" name="unit" value="1" />
 			</div>
 		</div>
 		<div class="col-7">