diff --git a/apps/settings/l10n/de.js b/apps/settings/l10n/de.js
new file mode 100644
index 0000000000000000000000000000000000000000..2820b40b0205b3c3e50908e6875d850ec00b3ecc
--- /dev/null
+++ b/apps/settings/l10n/de.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+		"2FA-Note": "<b>Notiz:</b> Sie müssen ein neues <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">anwendungs ​​kennwort</a> erstellen um Ihr Konto in /e/OS einzurichten. Zusätzlich müssen Sie Ihr <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">Hauptkonto-Passwort für /e/OS Mail angeben</a>."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/settings/l10n/de.json b/apps/settings/l10n/de.json
new file mode 100644
index 0000000000000000000000000000000000000000..493a4c72289f4f1a7e8a14c218a605ac6af517d5
--- /dev/null
+++ b/apps/settings/l10n/de.json
@@ -0,0 +1,6 @@
+{
+	"translations": {		
+		"2FA-Note": "<b>Notiz:</b> Sie müssen ein neues <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">anwendungs ​​kennwort</a> erstellen um Ihr Konto in /e/OS einzurichten. Zusätzlich müssen Sie Ihr <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">Hauptkonto-Passwort für /e/OS Mail angeben</a>."
+	},
+	"pluralForm": "nplurals=2; plural=(n != 1);"
+}
diff --git a/apps/settings/l10n/en.js b/apps/settings/l10n/en.js
new file mode 100755
index 0000000000000000000000000000000000000000..c0039b071ccbf03c32458c99bca253c958077fc0
--- /dev/null
+++ b/apps/settings/l10n/en.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+		"2FA-Note": "<b>Note:</b> You'll need to create a new <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">application password</a> to set your account within /e/OS. Additionally, you need to <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">provide your main account password to /e/OS Mail</a>."
+},
+"nplurals=2; plural=(n != 1);");
\ No newline at end of file
diff --git a/apps/settings/l10n/en.json b/apps/settings/l10n/en.json
new file mode 100755
index 0000000000000000000000000000000000000000..07930403129490f63e3586b9e06cf9cccca9e390
--- /dev/null
+++ b/apps/settings/l10n/en.json
@@ -0,0 +1,6 @@
+{
+	"translations": {
+		"2FA-Note": "<b>Note:</b> You'll need to create a new <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">application password</a> to set your account within /e/OS. Additionally, you need to <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">provide your main account password to /e/OS Mail</a>."
+    },
+	"pluralForm": "nplurals=2; plural=(n != 1);"
+}
diff --git a/apps/settings/l10n/es.js b/apps/settings/l10n/es.js
new file mode 100644
index 0000000000000000000000000000000000000000..811ad3824722c5c9775e410f35075ea90de5f553
--- /dev/null
+++ b/apps/settings/l10n/es.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+		"2FA-Note": "<b>Nota:</b> Deberá crear una nueva <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">contraseña de aplicación</a> para configurar su cuenta dentro de /e/OS. Además, debe proporcionar <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">la contraseña de su cuenta principal a /e/OS Mail</a>."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/settings/l10n/es.json b/apps/settings/l10n/es.json
new file mode 100644
index 0000000000000000000000000000000000000000..eefe2c2a68e9e9175accf3acd92bd221da686c1b
--- /dev/null
+++ b/apps/settings/l10n/es.json
@@ -0,0 +1,6 @@
+{
+	"translations": {
+		"2FA-Note": "<b>Nota:</b> Deberá crear una nueva <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">contraseña de aplicación</a> para configurar su cuenta dentro de /e/OS. Además, debe proporcionar <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">la contraseña de su cuenta principal a /e/OS Mail</a>."
+	},
+	"pluralForm": "nplurals=2; plural=(n != 1);"
+}
diff --git a/apps/settings/l10n/fr.js b/apps/settings/l10n/fr.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d25fb50f0c948b9996c13e85cbb4246d927c157
--- /dev/null
+++ b/apps/settings/l10n/fr.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+	"settings",
+    {
+		"2FA-Note": "<b>Remarque:</b> Vous devrez créer un nouveau mot de <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">passe d'application</a> pour configurer votre compte dans /e/OS. En outre, vous devez <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">fournir le mot de passe de votre compte principal à /e/OS Mail</a>."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/settings/l10n/fr.json b/apps/settings/l10n/fr.json
new file mode 100644
index 0000000000000000000000000000000000000000..ee23bab5c3c1e320b05b220bd7a7c4d028290525
--- /dev/null
+++ b/apps/settings/l10n/fr.json
@@ -0,0 +1,6 @@
+{
+	"translations": {
+		"2FA-Note": "<b>Remarque:</b> Vous devrez créer un nouveau mot de <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager\">passe d'application</a> pour configurer votre compte dans /e/OS. En outre, vous devez <a class=\"text-color-active\" href=\"https://doc.e.foundation/support-topics/two-factor-authentication#manually-setup-mail-application\">fournir le mot de passe de votre compte principal à /e/OS Mail</a>."
+	},
+	"pluralForm": "nplurals=2; plural=(n != 1);"
+}
diff --git a/core/css/server.css b/core/css/server.css
index 434010fd9286df35063ba1dc85836760af1982c5..e1dbe547e42b3fdd8709050c5667f467ab29f039 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -1731,3 +1731,9 @@
           left: 5% !important;
       }
   }
+.text-color-active {
+    color: var(--icon-active-color);
+}
+.margin-top-10{
+	margin-top: 10px;
+}