diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e43b0f98
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/_toc.yml b/_toc.yml
index 2b44b812..68778bf3 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -10,6 +10,7 @@ chapters:
   - file: user-guide/index
     sections:
       - file: user-guide/login_servers
+      - file: user-guide/MFA
       - file: user-guide/ms_teams
       - file: user-guide/evolution_for_o365
       - file: user-guide/thunderbird_for_o365
diff --git a/user-guide/MFA.md b/user-guide/MFA.md
new file mode 100644
index 00000000..afe85d0d
--- /dev/null
+++ b/user-guide/MFA.md
@@ -0,0 +1,35 @@
+# MFA - Multi Factor Authentication
+
+PSI multi factor authentication is based on a Microsoft Authenticatior infrastructure.
+
+This is how you can configure our account so that you are able to use any OTP instead of Microsoft Authenticator.
+
+1. Login to:
+
+https://mysignins.microsoft.com/security-info
+
+2. Click on Add Authentication Method
+![Alt text](MFA_1.png)
+
+3. Select Authenticator-App and click __Add__
+![Alt text](MFA_2.png)
+
+4. When you get this menu - click on the link __I want to add an other Authenticator-App__ (do NOT click on _Continue_)
+![Alt text](MFA_3.png)
+
+5. The dialog will then change to something like this. Now click on _Continue_.
+![Alt text](MFA_4.png)
+
+6. You will then have a QR code presented that you have to scan with your Authenticator app. 
+![Alt text](MFA_7.png)
+
+7. Verify the correct setup by entering an OTP code:
+![Alt text](MFA_5.png)
+
+8. Continue the dialog to finish adding the method.
+
+
+
+If you want to set OTP based authentication as default change the Standard Authentication Method to "Authenticator-App or Hardwaretoken - Code"
+
+![Alt text](MFA_6.png)
diff --git a/user-guide/MFA_1.png b/user-guide/MFA_1.png
new file mode 100644
index 00000000..d998821b
Binary files /dev/null and b/user-guide/MFA_1.png differ
diff --git a/user-guide/MFA_2.png b/user-guide/MFA_2.png
new file mode 100644
index 00000000..dae4932b
Binary files /dev/null and b/user-guide/MFA_2.png differ
diff --git a/user-guide/MFA_3.png b/user-guide/MFA_3.png
new file mode 100644
index 00000000..5cebd62d
Binary files /dev/null and b/user-guide/MFA_3.png differ
diff --git a/user-guide/MFA_4.png b/user-guide/MFA_4.png
new file mode 100644
index 00000000..1603ffdb
Binary files /dev/null and b/user-guide/MFA_4.png differ
diff --git a/user-guide/MFA_5.png b/user-guide/MFA_5.png
new file mode 100644
index 00000000..4bf75e6d
Binary files /dev/null and b/user-guide/MFA_5.png differ
diff --git a/user-guide/MFA_6.png b/user-guide/MFA_6.png
new file mode 100644
index 00000000..b03997f4
Binary files /dev/null and b/user-guide/MFA_6.png differ
diff --git a/user-guide/MFA_7.png b/user-guide/MFA_7.png
new file mode 100644
index 00000000..91e770ab
Binary files /dev/null and b/user-guide/MFA_7.png differ