diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index d384ef2657..d3ab389b7c 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -1239,9 +1239,13 @@ table.grid td.date {
 .icon-info {
 	padding: 11px 20px;
 	vertical-align: super;
+	opacity: .5;
 }
 
-#shareAPI h2, #encryptionAPI h2, #mail_general_settings h2 {
+#two-factor-auth h2,
+#shareAPI h2,
+#encryptionAPI h2,
+#mail_general_settings h2 {
 	display: inline-block;
 }
 
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index e6087175c7..ab69f36a00 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -65,6 +65,10 @@ if($_['passwordChangeSupported']) {
 
 <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>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>