diff --git a/resources/views/pages/settings/layout.blade.php b/resources/views/pages/settings/layout.blade.php
index 5cc7bce..d3667d6 100644
--- a/resources/views/pages/settings/layout.blade.php
+++ b/resources/views/pages/settings/layout.blade.php
@@ -7,9 +7,6 @@
             @if(auth()?->user()?->oidc_sub === null)
                 <flux:navlist.item :href="route('user-password.edit')" wire:navigate>{{ __('Password') }}</flux:navlist.item>
             @endif
-            @if (Laravel\Fortify\Features::canManageTwoFactorAuthentication() && auth()?->user()?->oidc_sub === null)
-                <flux:navlist.item :href="route('two-factor.show')" wire:navigate>{{ __('2FA') }}</flux:navlist.item>
-            @endif
             <flux:navlist.item :href="route('settings.support')" wire:navigate>{{ __('Support') }}</flux:navlist.item>
         </flux:navlist>
     </div>
diff --git a/resources/views/pages/settings/password.blade.php b/resources/views/pages/settings/password.blade.php
index e7c5deb..723cfed 100644
--- a/resources/views/pages/settings/password.blade.php
+++ b/resources/views/pages/settings/password.blade.php
@@ -83,5 +83,11 @@ new class extends Component
                 </x-action-message>
             </div>
         </form>
+        @if (Laravel\Fortify\Features::canManageTwoFactorAuthentication() && auth()?->user()?->oidc_sub === null)
+            <flux:heading class="mt-6">2FA</flux:heading>
+            <flux:subheading class="mb-4">Optionally, you can enable Two-Factor Authentication via TOTP</flux:subheading>
+
+            <flux:button :href="route('two-factor.show')" wire:navigate>{{ __('2FA Settings…') }}</flux:button>
+        @endif
     </x-pages::settings.layout>
 </section>