diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php
index 17356e6ccdf8a..d0070d926ec3e 100644
--- a/apps/settings/templates/help.php
+++ b/apps/settings/templates/help.php
@@ -3,57 +3,101 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 \OCP\Util::addStyle('settings', 'help');
+
+$knowledgebaseEmbedded = ($_['knowledgebaseEmbedded'] ?? false) === true;
+$mode = $_['mode'] ?? '';
+$isAdmin = (bool)($_['admin'] ?? false);
+
+$url = $_['url'] ?? '';
+$urlUserDocs = $_['urlUserDocs'] ?? '';
+$urlAdminDocs = $_['urlAdminDocs'] ?? '';
+$legalNoticeUrl = $_['legalNoticeUrl'] ?? '';
+$privacyUrl = $_['privacyUrl'] ?? '';
+
+$resources = [
+	[
+		'label' => $l->t('Account documentation'),
+		'standaloneLabel' => $l->t('Account documentation'),
+		'href' => $urlUserDocs,
+		'show' => true,
+		'embeddedIcon' => 'icon-user',
+		'embeddedMode' => 'user',
+		'external' => false,
+	],
+	[
+		'label' => $l->t('Administration documentation'),
+		'standaloneLabel' => $l->t('Administration documentation'),
+		'href' => $urlAdminDocs,
+		'show' => $isAdmin,
+		'embeddedIcon' => 'icon-user-admin',
+		'embeddedMode' => 'admin',
+		'external' => false,
+	],
+	[
+		'label' => $l->t('Documentation'),
+		'standaloneLabel' => $l->t('General documentation'),
+		'href' => 'https://docs.nextcloud.com',
+		'show' => true,
+		'embeddedIcon' => 'icon-category-office',
+		'external' => true,
+	],
+	[
+		'label' => $l->t('Forum'),
+		'standaloneLabel' => $l->t('Forum'),
+		'href' => 'https://help.nextcloud.com',
+		'show' => true,
+		'embeddedIcon' => 'icon-comment',
+		'external' => true,
+	],
+	[
+		'label' => $l->t('Legal notice'),
+		'standaloneLabel' => $l->t('Legal notice'),
+		'href' => $legalNoticeUrl,
+		'show' => !empty($legalNoticeUrl),
+		'external' => true,
+	],
+	[
+		'label' => $l->t('Privacy policy'),
+		'standaloneLabel' => $l->t('Privacy policy'),
+		'href' => $privacyUrl,
+		'show' => !empty($privacyUrl),
+		'external' => true,
+	],
+];
 ?>
-<?php if ($_['knowledgebaseEmbedded'] === true) : ?>
+
+<?php if ($knowledgebaseEmbedded): ?>
 	<div id="app-navigation" role="navigation" tabindex="0">
 		<ul>
-			<li>
-				<a class="help-list__link icon-user <?php if ($_['mode'] === 'user') {
-					p('active');
-				} ?>" <?php if ($_['mode'] === 'user') {
-					print_unescaped('aria-current="page"');
-				} ?>
-					href="<?php print_unescaped($_['urlUserDocs']); ?>">
-					<span class="help-list__text">
-						<?php p($l->t('Account documentation')); ?>
-					</span>
-				</a>
-			</li>
-		<?php if ($_['admin']) { ?>
-			<li>
-				<a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') {
-					p('active');
-				} ?>" <?php if ($_['mode'] === 'admin') {
-					print_unescaped('aria-current="page"');
-				} ?>
-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">
-					<span class="help-list__text">
-						<?php p($l->t('Administration documentation')); ?>
-					</span>
-				</a>
-			</li>
-		<?php } ?>
+			<?php foreach ($resources as $resource): ?>
+				<?php
+				if (!$resource['show'] || !isset($resource['embeddedIcon'])) {
+					continue;
+				}
 
-			<li>
-				<a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener">
-					<span class="help-list__text">
-						<?php p($l->t('Documentation')); ?> ↗
-					</span>
-				</a>
-			</li>
-			<li>
-				<a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener">
-					<span class="help-list__text">
-						<?php p($l->t('Forum')); ?> ↗
-					</span>
-				</a>
-			</li>
+				$isCurrent = isset($resource['embeddedMode']) && $resource['embeddedMode'] === $mode;
+				$linkClass = 'help-list__link ' . $resource['embeddedIcon'] . ($isCurrent ? ' active' : '');
+				$isExternal = $resource['external'] ?? false;
+				?>
+				<li>
+					<a
+						class="<?php p($linkClass); ?>"
+						<?php if ($isCurrent): ?>aria-current="page"<?php endif; ?>
+						href="<?php print_unescaped($resource['href']); ?>"
+						<?php if ($isExternal): ?>target="_blank" rel="noreferrer noopener"<?php endif; ?>>
+						<span class="help-list__text">
+							<?php p($resource['label'] . ($isExternal ? ' ↗' : '')); ?>
+						</span>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
 	</div>
 
 	<div id="app-content" class="help-includes">
-		<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0">
-		</iframe>
+		<iframe src="<?php print_unescaped($url); ?>" class="help-iframe" tabindex="0"></iframe>
 	</div>
 <?php else: ?>
 	<div id="app-content">
@@ -63,30 +107,19 @@
 					<?php p($l->t('Nextcloud help & privacy resources')); ?>
 				</h2>
 				<div class="help-content__body">
-				<a class="button" target="_blank" rel="noreferrer noopener"
-					href="<?php print_unescaped($_['urlUserDocs']); ?>">
-					<?php p($l->t('Account documentation')); ?>  ↗
-				</a>
-				<a class="button" target="_blank" rel="noreferrer noopener"
-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">
-					<?php p($l->t('Administration documentation')); ?>  ↗
-				</a>
-				<a href="https://docs.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
-					<?php p($l->t('General documentation')); ?> ↗
-				</a>
-				<a href="https://help.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
-					<?php p($l->t('Forum')); ?> ↗
-				</a>
-				<?php if ($_['legalNoticeUrl']) { ?>
-					<a href="<?php print_unescaped($_['legalNoticeUrl']); ?>" class="button" target="_blank" rel="noreferrer noopener">
-						<?php p($l->t('Legal notice')); ?> ↗
-					</a>
-				<?php } ?>
-				<?php if ($_['privacyUrl']) { ?>
-					<a href="<?php print_unescaped($_['privacyUrl']); ?>" class="button" target="_blank" rel="noreferrer noopener">
-						<?php p($l->t('Privacy policy')); ?> ↗
-					</a>
-				<?php } ?>
+					<?php foreach ($resources as $resource): ?>
+						<?php if (!$resource['show']) {
+							continue;
+						} ?>
+						<a
+							class="button"
+							target="_blank"
+							rel="noreferrer noopener"
+							href="<?php print_unescaped($resource['href']); ?>">
+							<?php p(($resource['standaloneLabel'] ?? $resource['label']) . ' ↗'); ?>
+						</a>
+					<?php endforeach; ?>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/apps/settings/templates/settings/additional.php b/apps/settings/templates/settings/additional.php
index 9e0b61ef65aad..ef4e9f69ee28d 100644
--- a/apps/settings/templates/settings/additional.php
+++ b/apps/settings/templates/settings/additional.php
@@ -9,8 +9,14 @@
 
 ?>
 
-<?php foreach ($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
-		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
-	<?php }
-	} ?>
+<?php foreach ($_['forms'] as $form): ?>
+	<?php
+	$formHtml = $form['form'] ?? null;
+	if ($formHtml === null) {
+		continue;
+	}
+
+	$anchor = $form['anchor'] ?? '';
+	?>
+	<div id="<?php p($anchor); ?>"><?php print_unescaped($formHtml); ?></div>
+<?php endforeach; ?>
diff --git a/apps/settings/templates/settings/admin/overview.php b/apps/settings/templates/settings/admin/overview.php
index 342a7421ada00..0eaabfa16bc33 100644
--- a/apps/settings/templates/settings/admin/overview.php
+++ b/apps/settings/templates/settings/admin/overview.php
@@ -8,12 +8,21 @@
 /** @var array $_ */
 /** @var \OCP\Defaults $theme */
 
+$baseUrl = $theme->getBaseUrl();
+$versionLabel = $_['version'] ?? '';
 ?>
 
 <div id="vue-admin-settings-setup-checks"></div>
 
 <div id="version" class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
-	<h2><?php p($l->t('Version'));?></h2>
-	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank">Nextcloud Hub 26 Winter</a> (<?php p($_['version']) ?>)</strong></p>
+	<h2><?php p($l->t('Version')); ?></h2>
+	<p>
+		<strong>
+			<a href="<?php print_unescaped($baseUrl); ?>" rel="noreferrer noopener" target="_blank">
+				Nextcloud Hub 26 Winter
+			</a>
+			(<?php p($versionLabel); ?>)
+		</strong>
+	</p>
 </div>
diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
index 4ad142f3c5872..678aa1839f97c 100644
--- a/apps/settings/templates/settings/frame.php
+++ b/apps/settings/templates/settings/frame.php
@@ -1,13 +1,26 @@
 <?php
 /**
- * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016-2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 style('settings', 'settings');
+
+$activeSectionId = $_['activeSectionId'] ?? '';
+$activeSectionType = $_['activeSectionType'] ?? '';
+
+$mainAttributes = '';
+
+if (!empty($activeSectionId)) {
+	$mainAttributes .= ' data-active-section-id="' . $activeSectionId . '"';
+}
+
+if (!empty($activeSectionType)) {
+	$mainAttributes .= ' data-active-section-type="' . $activeSectionType . '"';
+}
 ?>
 
 <div id="app-navigation"></div>
-<main id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>>
+<main id="app-content"<?php print_unescaped($mainAttributes); ?>>
 	<?php print_unescaped($_['content']); ?>
 </main>
diff --git a/apps/settings/templates/settings/personal/development.notice.php b/apps/settings/templates/settings/personal/development.notice.php
index c581962a79508..f2b6383112497 100644
--- a/apps/settings/templates/settings/personal/development.notice.php
+++ b/apps/settings/templates/settings/personal/development.notice.php
@@ -3,76 +3,76 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+$reasonsPdfLink = $_['reasons-use-nextcloud-pdf-link'] ?? '';
+
+$aboutPlaceholders = [
+	'{communityopen}',
+	'{githubopen}',
+	'{licenseopen}',
+	'{linkclose}',
+];
+$aboutReplacements = [
+	'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer noopener">',
+	'<a href="https://github.com/nextcloud" target="_blank" rel="noreferrer noopener">',
+	'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer noopener">',
+	'</a>',
+];
+$aboutText = $l->t(
+	'Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.'
+);
+
+$socialLinks = [
+	[
+		'href' => 'https://www.facebook.com/Nextclouders/',
+		'icon' => image_path('core', 'facebook-light.svg'),
+		'label' => $l->t('Like our Facebook page'),
+	],
+	[
+		'href' => 'https://bsky.app/profile/nextcloud.bsky.social',
+		'icon' => image_path('core', 'bluesky-light.svg'),
+		'label' => $l->t('Follow us on Bluesky'),
+	],
+	[
+		'href' => 'https://mastodon.xyz/@nextcloud',
+		'icon' => image_path('core', 'mastodon-light.svg'),
+		'label' => $l->t('Follow us on Mastodon'),
+	],
+	[
+		'href' => 'https://nextcloud.com/blog/',
+		'icon' => image_path('core', 'rss.svg'),
+		'label' => $l->t('Check out our blog'),
+	],
+	[
+		'href' => 'https://newsletter.nextcloud.com/?p=subscribe&id=1',
+		'icon' => image_path('core', 'mail.svg'),
+		'label' => $l->t('Subscribe to our newsletter'),
+	],
+];
 ?>
+
 <div class="section development-notice">
 	<p>
-		<a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button" target="_blank">
+		<a href="<?php p($reasonsPdfLink); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button" target="_blank">
 			<span class="icon-file-text" aria-hidden="true"></span>
-			<?php p($l->t('Reasons to use Nextcloud in your organization'));?>
+			<?php p($l->t('Reasons to use Nextcloud in your organization')); ?>
 		</a>
 	</p>
+
 	<p>
-		<?php print_unescaped(str_replace(
-			[
-				'{communityopen}',
-				'{githubopen}',
-				'{licenseopen}',
-				'{linkclose}',
-			],
-			[
-				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer noopener">',
-				'<a href="https://github.com/nextcloud" target="_blank" rel="noreferrer noopener">',
-				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer noopener">',
-				'</a>',
-			],
-			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.')
-		)); ?>
+		<?php print_unescaped(str_replace($aboutPlaceholders, $aboutReplacements, $aboutText)); ?>
 	</p>
 
 	<p class="social-button">
-		<?php print_unescaped(str_replace(
-			[
-				'{facebookimage}',
-				'{blueskyimage}',
-				'{mastodonimage}',
-				'{rssimage}',
-				'{mailimage}',
-				'{facebookopen}',
-				'{blueskyopen}',
-				'{mastodonopen}',
-				'{rssopen}',
-				'{newsletteropen}',
-				'{linkclose}',
-				'{facebooktext}',
-				'{blueskytext}',
-				'{mastodontext}',
-				'{rsstext}',
-				'{mailtext}',
-			],
-			[
-				image_path('core', 'facebook-light.svg'),
-				image_path('core', 'bluesky-light.svg'),
-				image_path('core', 'mastodon-light.svg'),
-				image_path('core', 'rss.svg'),
-				image_path('core', 'mail.svg'),
-				'<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://bsky.app/profile/nextcloud.bsky.social">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/blog/">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
-				'</a>',
-				$l->t('Like our Facebook page'),
-				$l->t('Follow us on Bluesky'),
-				$l->t('Follow us on Mastodon'),
-				$l->t('Check out our blog'),
-				$l->t('Subscribe to our newsletter'),
-
-			],
-			'{facebookopen}<img width="50" height="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
-			{blueskyopen}<img width="50" height="50" src="{blueskyimage}" title="{blueskytext}" alt="{blueskytext}">{linkclose}
-			{mastodonopen}<img width="50" height="50" src="{mastodonimage}" title="{mastodontext}" alt="{mastodontext}">{linkclose}
-			{rssopen}<img width="50" height="50" src="{rssimage}" title="{rsstext}" alt="{rsstext}">{linkclose}
-			{newsletteropen}<img width="50" height="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
-		)); ?>
+		<?php foreach ($socialLinks as $socialLink): ?>
+			<a target="_blank" rel="noreferrer noopener" href="<?php p($socialLink['href']); ?>">
+				<img
+					width="50"
+					height="50"
+					src="<?php p($socialLink['icon']); ?>"
+					title="<?php p($socialLink['label']); ?>"
+					alt="<?php p($socialLink['label']); ?>">
+			</a>
+		<?php endforeach; ?>
 	</p>
 </div>
diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php
index 9dc789245be29..4b39d6ace1cbf 100644
--- a/apps/settings/templates/settings/personal/personal.info.php
+++ b/apps/settings/templates/settings/personal/personal.info.php
@@ -9,8 +9,39 @@
 /** @var array $_ */
 
 \OCP\Util::addScript('settings', 'vue-settings-personal-info');
+
+$isFairUseOfFreePushService = (bool)($_['isFairUseOfFreePushService'] ?? true);
+$profileEnabledGlobally = (bool)($_['profileEnabledGlobally'] ?? false);
+
+$settingSections = [
+	['id' => 'vue-displayname-section'],
+	['id' => 'vue-pronouns-section'],
+	['id' => 'vue-email-section'],
+	['id' => 'vue-phone-section'],
+	['id' => 'vue-location-section'],
+	['id' => 'vue-birthday-section'],
+	['id' => 'vue-language-section', 'boxClass' => 'personal-settings-setting-box personal-settings-language-box'],
+	['id' => 'vue-locale-section', 'boxClass' => 'personal-settings-setting-box personal-settings-locale-box'],
+	['id' => 'vue-fdow-section'],
+	['id' => 'vue-timezone-section'],
+	['id' => 'vue-website-section'],
+	['id' => 'vue-twitter-section'],
+	['id' => 'vue-bluesky-section'],
+	['id' => 'vue-fediverse-section'],
+	['id' => 'vue-organisation-section', 'profileOnly' => true],
+	['id' => 'vue-role-section', 'profileOnly' => true],
+	['id' => 'vue-headline-section', 'profileOnly' => true],
+	['id' => 'vue-biography-section', 'profileOnly' => true],
+];
+
+$renderSettingBox = static function (string $sectionId, string $boxClass = 'personal-settings-setting-box'): void { ?>
+	<div class="<?php p($boxClass); ?>">
+		<div id="<?php p($sectionId); ?>"></div>
+	</div>
+<?php };
 ?>
-<?php if (!$_['isFairUseOfFreePushService']) : ?>
+
+<?php if (!$isFairUseOfFreePushService): ?>
 	<div class="section">
 		<div class="warning">
 			<?php p($l->t('This community release of Nextcloud is unsupported and instant notifications are unavailable.')); ?>
@@ -20,8 +51,10 @@
 
 <div id="personal-settings">
 	<h2 class="hidden-visually"><?php p($l->t('Personal info')); ?></h2>
+
 	<div id="vue-avatar-section"></div>
-	<?php if ($_['profileEnabledGlobally']) : ?>
+
+	<?php if ($profileEnabledGlobally): ?>
 		<div class="personal-settings-setting-box personal-settings-setting-box-profile">
 			<div id="vue-profile-section"></div>
 		</div>
@@ -33,67 +66,25 @@
 			<div id="vue-details-section"></div>
 		</div>
 	<?php endif; ?>
-	<div class="personal-settings-setting-box">
-		<div id="vue-displayname-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-pronouns-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-email-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-phone-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-location-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-birthday-section"></div>
-	</div>
-	<div class="personal-settings-setting-box personal-settings-language-box">
-		<div id="vue-language-section"></div>
-	</div>
-	<div class="personal-settings-setting-box personal-settings-locale-box">
-		<div id="vue-locale-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-fdow-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-timezone-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-website-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-twitter-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-bluesky-section"></div>
-	</div>
-	<div class="personal-settings-setting-box">
-		<div id="vue-fediverse-section"></div>
-	</div>
-	<?php if ($_['profileEnabledGlobally']) : ?>
-		<div class="personal-settings-setting-box">
-			<div id="vue-organisation-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-role-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-headline-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-biography-section"></div>
-		</div>
-	<?php endif; ?>
-	<span class="msg"></span>
 
+	<?php foreach ($settingSections as $section): ?>
+		<?php
+		$isProfileOnly = $section['profileOnly'] ?? false;
+		if ($isProfileOnly && !$profileEnabledGlobally) {
+			continue;
+		}
+
+		$sectionId = $section['id'];
+		$boxClass = $section['boxClass'] ?? 'personal-settings-setting-box';
+		$renderSettingBox($sectionId, $boxClass);
+		?>
+	<?php endforeach; ?>
+
+	<span class="msg"></span>
 	<div id="personal-settings-group-container"></div>
 </div>
-<?php if ($_['profileEnabledGlobally']) : ?>
+
+<?php if ($profileEnabledGlobally): ?>
 	<div class="personal-settings-section">
 		<div id="vue-profile-visibility-section"></div>
 	</div>
diff --git a/apps/settings/templates/settings/personal/security/twofactor.php b/apps/settings/templates/settings/personal/security/twofactor.php
index 986c28a95e615..0faa9b6d68cfa 100644
--- a/apps/settings/templates/settings/personal/security/twofactor.php
+++ b/apps/settings/templates/settings/personal/security/twofactor.php
@@ -5,38 +5,46 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+$providerData = $_['twoFactorProviderData'] ?? [];
+$providers = $providerData['providers'] ?? [];
 ?>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
-	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
-	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
-	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.'));?></p>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
+	<a target="_blank"
+		rel="noreferrer noopener"
+		class="icon-info"
+		title="<?php p($l->t('Open documentation')); ?>"
+		href="<?php p(link_to_docs('user-2fa')); ?>"></a>
+
+	<p class="settings-hint">
+		<?php p($l->t('Use a second factor besides your password to increase security for your account.')); ?>
+	</p>
+	<p class="settings-hint">
+		<?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.')); ?>
+	</p>
+
 	<ul>
-	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
-		<li>
+		<?php foreach ($providers as $data): ?>
 			<?php
-
 			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
 			$provider = $data['provider'];
-		//Handle 2FA provider icons and theme
-		if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-			$icon = $provider->getDarkIcon();
-			//fallback icon if the 2factor provider doesn't provide an icon.
-		} else {
-			$icon = image_path('core', 'actions/password.svg');
-		}
-		/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-		$settings = $data['settings'];
-		?>
-			<h3>
-				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
-				<?php p($provider->getDisplayName()) ?>
-			</h3>
-			<?php print_unescaped($settings->getBody()->fetchPage()) ?>
-		</li>
-	<?php } ?>
+
+			// Handle 2FA provider icons and theme.
+			$icon = $provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons
+				? $provider->getDarkIcon()
+				: image_path('core', 'actions/password.svg'); // Fallback icon if 2FA provider doesn't provide one.
+
+			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+			$settings = $data['settings'];
+			?>
+			<li>
+				<h3>
+					<img class="two-factor-provider-settings-icon" src="<?php p($icon); ?>" alt="">
+					<?php p($provider->getDisplayName()); ?>
+				</h3>
+				<?php print_unescaped($settings->getBody()->fetchPage()); ?>
+			</li>
+		<?php endforeach; ?>
 	</ul>
 </div>