diff --git a/docs/2fa/2fa-disable.md b/docs/2fa/2fa-disable.md
new file mode 100644
index 0000000..a18abed
--- /dev/null
+++ b/docs/2fa/2fa-disable.md
@@ -0,0 +1,19 @@
+## Disabling Two-Factor Authentication (2FA)
+
+
+### Disable TOTP
+
+1. Log in to your SimpleLogin account using your browser.
+2. Locate the "Two Factor Authentication" section in the account settings.
+3. Click on the "Disable TOTP" button to initiate the process. You will be prompted to enter your account password.
+4. Click on the "Submit" button to verify your identity.
+5. Click on the "Disable TOTP" button to confirm.
+
+## Disabling WebAuthn (FIDO)
+
+1. Locate the "Security Key (WebAuthn)" section in the account settings.
+2. Click on the "Manage WebAuth" button to initiate the process.
+3. You will be directed to the "Manage Your Security Key" page.
+4. Find and click the "Unlink" button next to the security key you wish to unlink.
+
+**Disabling Two-Factor Authentication (2FA) or WebAuthn (FIDO) reduces the security of your account. We strongly recommend reactivating 2FA to protect account against unauthorized access.**
diff --git a/docs/2fa/2fa-enable.md b/docs/2fa/2fa-enable.md
new file mode 100644
index 0000000..b1fdd06
--- /dev/null
+++ b/docs/2fa/2fa-enable.md
@@ -0,0 +1,25 @@
+## Two-Factor Authentication (2FA) setup
+
+1. Log in to your SimpleLogin account using your browser.
+2. Head to the "Settings" section located in the top-right corner of your dashboard.
+3. Navigate to the "Security" or "Security Settings" tab to configure your authentication options.
+
+## Authenticator App Setup
+
+1. Locate the "Two Factor Authentication" option.
+2. Press "Setup TOTP" button to enable 2FA. You will have to enter your account password for security verification.
+3. Select a 2FA application on your phone or PC (e.g., Proton Pass, Aegis)
+4. Scan the provided QR code or manually enter the secret key into the app.
+5. Retrieve the 6-digit token generated by the authenticator
+
+## Security Key Authentication Setup
+
+1. Locate the "Security Key (WebAuthn)" option.
+2. Click on "Setup WebAuthn" to initiate the Security Key setup process.
+3. Provide a name for your key (required) for easy identification.
+4. Click on "Register Key" to complete the registration process. You shoud follow your browser instructions to register your security key with SimpleLogin.
+
+## Recovery codes
+
+After setting up 2FA, you will see recovery codes. You should store them in a safe and easily accessible location, considering using a secure physical drive (recommended) or password manager. Be aware that each recovery code can't be used more than one time. 
+We recommend to keep track of used and unused codes to maintain account accessibility.
diff --git a/mkdocs.yml b/mkdocs.yml
index 57fdb3d..579be4a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -76,6 +76,10 @@ nav:
     - Student discount: subscription/student-discount.md
     - Family discount: subscription/family-plan.md
     - Switch plan (Proton Unlimited): subscription/switch-plan-proton-unlimited.md
+ 
+  - Two factor authentication:
+    - 2FA enable: 2fa/2fa-enable.md
+    - 2FA disable: 2fa/2fa-disable.md
 
   - SIWSL:
     - Welcome: siwsl/intro.md