diff --git a/docs/accounts/m365_mfa.md b/docs/accounts/m365_mfa.md
index 13f55f55e3f0f6bae0ca0b8278fcbb045a57122f..fc1087baa88bac6a83a894ee9822fdf2102f18af 100644
--- a/docs/accounts/m365_mfa.md
+++ b/docs/accounts/m365_mfa.md
@@ -5,19 +5,14 @@ Multifactor authentication (MFA) is becoming mandatory on Bocal accounts on
 and you changed phone number or removed the authenticator app, you need to
 remove the old method or **you will lose access to your account**.
 
-## Remove an old MFA method
-
-!!! warning
-    You need to follow these steps before **Wednesday the 9th of March, 2022**
-    if you set up MFA in the past and changed phone numbers afterwards. You also
-    have to do this if you set up the Microsoft Authenticator app (or any TOTP
-    app) and uninstalled it without disabling it in your account settings. If
-    you don't follow this, **you will lose access to your account** when MFA
-    will be mandatory again.
+!!! note
+    If you lost access to your account, you must reach the relevant department
+    with a proof of identity (ID card, student card) : Student Service Centre
+    (*scolarité*) if you are a student or a teacher, [Katherine Aguilar](mailto:katherine.aguilar@epita.fr)
+    if you are an alumnus, your department manager or the CRI if you are an
+    employee,
 
-    After this date, if you lost access to your account, you must reach to the
-    student service centre (*scolarité*) with a proof of identity (ID card,
-    student card).
+## Remove an old MFA method
 
 * Go to the [Microsoft 365 Portal](https://portal.office.com)
 * On the top right corner of the page, click on your initials or profile picture
@@ -93,8 +88,15 @@ computer with [WinAuth](https://winauth.github.io/winauth/download.html)
 * Fill in the form with your phone number and click "Done", it will be used in
   case you uninstall the app without disabling MFA in your account settings.
 
+!!! tips
+    The phone number is not verified by Microsoft, if you do not wish to share
+    your real number or do not have access to a working phone subscription,
+    you may enter a bogus number.
+
+
 ![TOTP mobile app](./assets/mfa_totp_2.png)
 
+
 ## Setting up Thunderbird with MFA
 
 Thunderbird needs a special configuration in order to work with MFA.
diff --git a/docs/general/contact.md b/docs/contact.md
similarity index 74%
rename from docs/general/contact.md
rename to docs/contact.md
index 7a1e3ee68cf3fa86731a05b76149e977c14ebe0b..bd09135f98c2124fc8ae67c7602eaf2eecd5799b 100644
--- a/docs/general/contact.md
+++ b/docs/contact.md
@@ -5,8 +5,6 @@ assistants and not directly to the Bocal or CRI. It is to the assistants
 responsibility to try solve any problem or to contact the CRI or the Bocal if
 needed.
 
-Any person contacting the Bocal without any justification might be punished.
-
 Any application towards assistants, the CRI or the Bocal must be as clear as
 possible, with a maximum of information.
 
@@ -18,8 +16,9 @@ one has to contact his assistants.
 
 ## Bocal
 
-To contact the Bocal, one has to create a ticket on their
-[Jira](https://jira.ionis-it.com) instance.
+To contact the Bocal, one has to create a ticket on [Jira](https://jira.ionis-it.com).
+
+You may use the "IONIS SSO" button to sign-in with your Microsoft 365 account.
 
 ## CRI
 
@@ -29,5 +28,5 @@ To contact the CRI, one has to create a ticket by sending a mail at
 ## Facebook / Discord
 
 Facebook, Discord and personal communication channels in general are not valid
-ways to communicate with the school! Any person trying to contact the CRI via
-this means will be punished.
+ways to communicate with us. Any person trying to contact the CRI via these
+means will at best be ignored.
diff --git a/docs/from_school/print.md b/docs/from_school/print.md
index 61eef2f098065d1ad01d34e004cce72b1b0595de..a32448f031df94e8b36bea0acdffe3274e2d06fc 100644
--- a/docs/from_school/print.md
+++ b/docs/from_school/print.md
@@ -1,4 +1,4 @@
-# Print documents
+# Printers
 
 !!! note
     These printers are not managed nor maintained by the CRI.
diff --git a/mkdocs.yml b/mkdocs.yml
index 44914e81c2f8fd0be2c2d026f703d503d77c02fb..a6bea31c5cfd6a2fb3216902ed6e72191c29b018 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,24 +4,26 @@ theme:
 repo_url: https://gitlab.cri.epita.fr/cri/documentation/epita-doc
 markdown_extensions:
   - admonition
+  - toc:
+      permalink: True
 nav:
   - Home: 'index.md'
-  - General:
-    - 'general/git.md'
-    - 'general/news.md'
-    - 'general/contact.md'
+  - Contact: 'contact.md'
   - Accounts:
     - CRI and Bocal accounts: 'accounts/accounts.md'
     - Recover and modify passwords: 'accounts/passwords.md'
     - 'accounts/m365_mfa.md'
+  - General:
+    - 'general/git.md'
+    - 'general/news.md'
   - Working from school:
+    - Machines room rules: 'charte.pdf'
     - PIE: 'from_school/pie.md'
     - 'from_school/wifi.md'
     - Netboot : 'from_school/netboot.md'
     - AFS: 'from_school/afs.md'
     - 'from_school/map.md'
     - 'from_school/print.md'
-  - Machines Room rules: 'charte.pdf'
   - Working from home:
     - CRI VM: 'from_home/vm/index.md'
     - CRI VM VirtualBox: 'from_home/vm/virtualbox.md'