diff --git a/frontend/package.json b/frontend/package.json
index 34e8577be5..13f0b2ea27 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,8 +4,8 @@
   "license": "BSD-2-Clause",
   "private": false,
   "dependencies": {
-    "@formatjs/intl-pluralrules": "^3.4.6",
-    "@formatjs/intl-relativetimeformat": "^7.2.6",
+    "@formatjs/intl-pluralrules": "^3.4.7",
+    "@formatjs/intl-relativetimeformat": "^7.2.7",
     "@formatjs/intl-utils": "^3.8.4",
     "@formatjs/macro": "^0.2.8",
     "@hotosm/id": "^2.18.5",
diff --git a/frontend/src/locales/ar.json b/frontend/src/locales/ar.json
index d7e3b1005a..5112156c13 100644
--- a/frontend/src/locales/ar.json
+++ b/frontend/src/locales/ar.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "",
   "notifications.bodytitle.message": "",
   "notifications.filter.tasks": "",
+  "notifications.filter.teams": "",
   "notifications.filter.projects": "",
   "notifications.filter.clear": "",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/cs.json b/frontend/src/locales/cs.json
index 15d014343d..f7dc52d74e 100644
--- a/frontend/src/locales/cs.json
+++ b/frontend/src/locales/cs.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Zprávy",
   "notifications.bodytitle.message": "Zpráva",
   "notifications.filter.tasks": "Úlohy",
+  "notifications.filter.teams": "Týmy",
   "notifications.filter.projects": "Projekty",
   "notifications.filter.clear": "Vymazat filtry",
   "notifications.markAsRead": "Označit jako přečtené",
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 636a5cd683..420ab44d9b 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Nachrichten",
   "notifications.bodytitle.message": "Nachricht",
   "notifications.filter.tasks": "Aufgaben",
+  "notifications.filter.teams": "Gruppen",
   "notifications.filter.projects": "Projekte",
   "notifications.filter.clear": "Filter löschen",
   "notifications.markAsRead": "Als gelesen markieren",
diff --git a/frontend/src/locales/el.json b/frontend/src/locales/el.json
index 47ad48e4c9..a2f195ea50 100644
--- a/frontend/src/locales/el.json
+++ b/frontend/src/locales/el.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Μηνύματα",
   "notifications.bodytitle.message": "Μήνυμα",
   "notifications.filter.tasks": "Εργασίες",
+  "notifications.filter.teams": "Ομάδες",
   "notifications.filter.projects": "Έργα",
   "notifications.filter.clear": "Καθαρισμός φίλτρων",
   "notifications.markAsRead": "Σήμανση ως αναγνωσμένο",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index b5d537b1a4..15a930b7dd 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Mensajes",
   "notifications.bodytitle.message": "Mensaje",
   "notifications.filter.tasks": "Tareas",
+  "notifications.filter.teams": "Equipos",
   "notifications.filter.projects": "Proyectos",
   "notifications.filter.clear": "Borrar filtros",
   "notifications.markAsRead": "Marcar como leído",
diff --git a/frontend/src/locales/fa_IR.json b/frontend/src/locales/fa_IR.json
index ded4e5fc41..96b27db351 100644
--- a/frontend/src/locales/fa_IR.json
+++ b/frontend/src/locales/fa_IR.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "پیام‌ها",
   "notifications.bodytitle.message": "پیام",
   "notifications.filter.tasks": "وظایف",
+  "notifications.filter.teams": "تیم ها",
   "notifications.filter.projects": "پروژه‌ها",
   "notifications.filter.clear": "پاک کردن فیلتر ها",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 8da99a66b6..8e8badd0bb 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Messages",
   "notifications.bodytitle.message": "Message",
   "notifications.filter.tasks": "Tâches",
+  "notifications.filter.teams": "Équipes",
   "notifications.filter.projects": "Projets",
   "notifications.filter.clear": "Réinitialiser les filtres",
   "notifications.markAsRead": "Marquer comme lu",
diff --git a/frontend/src/locales/he.json b/frontend/src/locales/he.json
index d6eff68f79..b1b70fd30a 100644
--- a/frontend/src/locales/he.json
+++ b/frontend/src/locales/he.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "הודעות",
   "notifications.bodytitle.message": "הודעה",
   "notifications.filter.tasks": "משימות",
+  "notifications.filter.teams": "צוותים",
   "notifications.filter.projects": "מיזמים",
   "notifications.filter.clear": "השבתת המסננים",
   "notifications.markAsRead": "סימון כנקרא",
diff --git a/frontend/src/locales/hu.json b/frontend/src/locales/hu.json
index 0ca156f23b..8604f1146c 100644
--- a/frontend/src/locales/hu.json
+++ b/frontend/src/locales/hu.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Üzenetek",
   "notifications.bodytitle.message": "Üzenet",
   "notifications.filter.tasks": "Feladatok",
+  "notifications.filter.teams": "Csoportok",
   "notifications.filter.projects": "Projektek",
   "notifications.filter.clear": "Szűrők törlése",
   "notifications.markAsRead": "Megjelölés olvasottként",
diff --git a/frontend/src/locales/id.json b/frontend/src/locales/id.json
index 47e49b403e..b2414b8df8 100644
--- a/frontend/src/locales/id.json
+++ b/frontend/src/locales/id.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Pesan",
   "notifications.bodytitle.message": "Pesan",
   "notifications.filter.tasks": "Tasks",
+  "notifications.filter.teams": "Tim",
   "notifications.filter.projects": "Proyek",
   "notifications.filter.clear": "Hapus filter",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 02e078daee..0f05fdcd7b 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Messaggi",
   "notifications.bodytitle.message": "Messaggio",
   "notifications.filter.tasks": "Compiti",
+  "notifications.filter.teams": "Gruppi",
   "notifications.filter.projects": "Progetti",
   "notifications.filter.clear": "Rimuovi filtri",
   "notifications.markAsRead": "Segna come letto",
diff --git a/frontend/src/locales/ja.json b/frontend/src/locales/ja.json
index af586971c5..31c913ea5c 100644
--- a/frontend/src/locales/ja.json
+++ b/frontend/src/locales/ja.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "メッセージ",
   "notifications.bodytitle.message": "メッセージ",
   "notifications.filter.tasks": "タスク",
+  "notifications.filter.teams": "チーム",
   "notifications.filter.projects": "プロジェクト",
   "notifications.filter.clear": "フィルタを解除",
   "notifications.markAsRead": "既読にする",
diff --git a/frontend/src/locales/mg.json b/frontend/src/locales/mg.json
index 9a079343e0..81c4cd53ec 100644
--- a/frontend/src/locales/mg.json
+++ b/frontend/src/locales/mg.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Hafatra",
   "notifications.bodytitle.message": "Hafatra",
   "notifications.filter.tasks": "Asa",
+  "notifications.filter.teams": "",
   "notifications.filter.projects": "Tetikasa",
   "notifications.filter.clear": "",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/ml.json b/frontend/src/locales/ml.json
index fdaf3e00b0..4e4f145de9 100644
--- a/frontend/src/locales/ml.json
+++ b/frontend/src/locales/ml.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "",
   "notifications.bodytitle.message": "",
   "notifications.filter.tasks": "",
+  "notifications.filter.teams": "",
   "notifications.filter.projects": "",
   "notifications.filter.clear": "",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/nl_NL.json b/frontend/src/locales/nl_NL.json
index 691ac8b302..311617167f 100644
--- a/frontend/src/locales/nl_NL.json
+++ b/frontend/src/locales/nl_NL.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Berichten",
   "notifications.bodytitle.message": "Bericht",
   "notifications.filter.tasks": "Taken",
+  "notifications.filter.teams": "Teams",
   "notifications.filter.projects": "Projecten",
   "notifications.filter.clear": "Filters leegmaken",
   "notifications.markAsRead": "Markeren als gelezen",
diff --git a/frontend/src/locales/pt.json b/frontend/src/locales/pt.json
index 180d7fab33..d803334d23 100644
--- a/frontend/src/locales/pt.json
+++ b/frontend/src/locales/pt.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Mensagens",
   "notifications.bodytitle.message": "Mensagem",
   "notifications.filter.tasks": "Tarefas",
+  "notifications.filter.teams": "Equipas",
   "notifications.filter.projects": "Projetos",
   "notifications.filter.clear": "Limpar filtros",
   "notifications.markAsRead": "Marcar como lida",
diff --git a/frontend/src/locales/pt_BR.json b/frontend/src/locales/pt_BR.json
index 5ba35de3f0..4ba29a9e86 100644
--- a/frontend/src/locales/pt_BR.json
+++ b/frontend/src/locales/pt_BR.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Mensagens",
   "notifications.bodytitle.message": "Mensagem",
   "notifications.filter.tasks": "Tarefas",
+  "notifications.filter.teams": "Equipes",
   "notifications.filter.projects": "Projetos",
   "notifications.filter.clear": "Limpar filtros",
   "notifications.markAsRead": "Marcar como lido",
diff --git a/frontend/src/locales/sv.json b/frontend/src/locales/sv.json
index ad2b25c78e..4e5b72f765 100644
--- a/frontend/src/locales/sv.json
+++ b/frontend/src/locales/sv.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Meddelanden",
   "notifications.bodytitle.message": "Meddelande",
   "notifications.filter.tasks": "Uppgifter",
+  "notifications.filter.teams": "Lag",
   "notifications.filter.projects": "Projekt",
   "notifications.filter.clear": "Rensa filter",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/sw.json b/frontend/src/locales/sw.json
index 1cc6fadf52..ba6148eb37 100644
--- a/frontend/src/locales/sw.json
+++ b/frontend/src/locales/sw.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Ujumbe",
   "notifications.bodytitle.message": "Ujumbe",
   "notifications.filter.tasks": "Kazi",
+  "notifications.filter.teams": "Timu",
   "notifications.filter.projects": "Miradi",
   "notifications.filter.clear": "Futa vichujio",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/tl.json b/frontend/src/locales/tl.json
index fdaf3e00b0..4e4f145de9 100644
--- a/frontend/src/locales/tl.json
+++ b/frontend/src/locales/tl.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "",
   "notifications.bodytitle.message": "",
   "notifications.filter.tasks": "",
+  "notifications.filter.teams": "",
   "notifications.filter.projects": "",
   "notifications.filter.clear": "",
   "notifications.markAsRead": "",
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index 2e7538d565..670406ca1f 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Mesajlar",
   "notifications.bodytitle.message": "Mesaj",
   "notifications.filter.tasks": "Görevler",
+  "notifications.filter.teams": "Ekipler",
   "notifications.filter.projects": "Projeler ",
   "notifications.filter.clear": "Filtreleri Temizle",
   "notifications.markAsRead": "Okundu olarak işaretle",
diff --git a/frontend/src/locales/uk.json b/frontend/src/locales/uk.json
index 007442185b..56126d36b8 100644
--- a/frontend/src/locales/uk.json
+++ b/frontend/src/locales/uk.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "Повідомлення",
   "notifications.bodytitle.message": "Повідомлення",
   "notifications.filter.tasks": "Завдання",
+  "notifications.filter.teams": "Команди",
   "notifications.filter.projects": "Проєкти",
   "notifications.filter.clear": "Скинути фільтри",
   "notifications.markAsRead": "Позначити як прочитане",
diff --git a/frontend/src/locales/zh_TW.json b/frontend/src/locales/zh_TW.json
index bedcba9ea8..527a39ae9d 100644
--- a/frontend/src/locales/zh_TW.json
+++ b/frontend/src/locales/zh_TW.json
@@ -145,6 +145,7 @@
   "notifications.filter.messages": "收件匣",
   "notifications.bodytitle.message": "訊息",
   "notifications.filter.tasks": "任務",
+  "notifications.filter.teams": "團隊",
   "notifications.filter.projects": "專案",
   "notifications.filter.clear": "清除過濾條件",
   "notifications.markAsRead": "標示為已讀",
diff --git a/frontend/src/views/projectEdit.js b/frontend/src/views/projectEdit.js
index e05c9c7566..4495b3aef0 100644
--- a/frontend/src/views/projectEdit.js
+++ b/frontend/src/views/projectEdit.js
@@ -53,7 +53,6 @@ export function ProjectEdit({ id }) {
   useSetTitleTag(`Edit project #${id}`);
   const mandatoryFields = ['name', 'shortDescription', 'description', 'instructions'];
   const token = useSelector((state) => state.auth.get('token'));
-  const user = useSelector((state) => state.auth.get('userDetails'));
   const [error, setError] = useState(null);
   const [success, setSuccess] = useState(false);
   const [languages, setLanguages] = useState(null);
@@ -133,20 +132,18 @@ export function ProjectEdit({ id }) {
       { value: 'permissions' },
       { value: 'settings' },
       { value: 'actions' },
-      { value: 'custom_editor', expert_required: true },
+      { value: 'custom_editor' },
     ];
 
     return (
       <div>
         <ul className="list pl0 mt0 ttu">
-          {elements
-            .filter((elm) => !elm.expert_required || user.isExpert)
-            .map((elm, n) => (
-              <li key={n} className={checkSelected(elm.value)} onClick={() => setOption(elm.value)}>
-                <FormattedMessage {...messages[`projectEditSection_${elm.value}`]} />
-                {elm.required && ' *'}
-              </li>
-            ))}
+          {elements.map((elm, n) => (
+            <li key={n} className={checkSelected(elm.value)} onClick={() => setOption(elm.value)}>
+              <FormattedMessage {...messages[`projectEditSection_${elm.value}`]} />
+              {elm.required && ' *'}
+            </li>
+          ))}
         </ul>
       </div>
     );
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 0fcc2c3da1..8517161f80 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1135,10 +1135,10 @@
   resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.0.tgz#5b03ba4931436070ad926d1b2e89bf07edc5ea5b"
   integrity sha512-jc1bZHhIE1YI0HnZIZcdlKpF4wle2pkgQpzXHDoyy4bUqzBSvDqktnF26hOkyA04KD4wqd61gkuTvRrHMmroAg==
 
-"@formatjs/ecma402-abstract@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.1.tgz#ad966998d7f0e96fca4bdc5de0ca28d02f371279"
-  integrity sha512-LvbwgHxprafjceDfOC7yMl4sP5al71rAWahXk3qug5bV020aCq64WjqAo+zNnkIJk8hqK2pFKnNdDsT58HZJQw==
+"@formatjs/ecma402-abstract@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.2.tgz#4810bdbd696d3805c535fd0620b7c8f45ab3164f"
+  integrity sha512-mLCoAPGlXCVskb/ojBO6iurGqwo6sZvAl8pRC4N25bz4LPWExAM9LsOo057zN3Br1JxUM3RZHG4YGnVt+nSRYQ==
 
 "@formatjs/intl-displaynames@^3.3.6":
   version "3.3.6"
@@ -1154,12 +1154,12 @@
   dependencies:
     "@formatjs/ecma402-abstract" "^1.2.0"
 
-"@formatjs/intl-pluralrules@^3.4.6":
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-3.4.6.tgz#3047b1fc5c6f5d097588214a35650b8047d82c2f"
-  integrity sha512-6/K0Lqlej2bYM1K3HfSNsEURHlsmWJhrE95k/hZdE4wo7k5S7Fc/QUfHlieLQvCXF77n/zVgzp/9bpgxMDxL0A==
+"@formatjs/intl-pluralrules@^3.4.7":
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-3.4.7.tgz#5e46383c585f77d96c0e8c845c5579a67c0c1faa"
+  integrity sha512-CSftdNs8afT1VfB5vQFlSzhEZ+ckbkxzYxNXCeLYt66mXnuCukr7KCsZJHUTMyjlEAnFbfqXnKCtWDs5JMBrog==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.1"
+    "@formatjs/ecma402-abstract" "^1.2.2"
 
 "@formatjs/intl-relativetimeformat@^7.2.5":
   version "7.2.5"
@@ -1168,12 +1168,12 @@
   dependencies:
     "@formatjs/ecma402-abstract" "^1.2.0"
 
-"@formatjs/intl-relativetimeformat@^7.2.6":
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.6.tgz#7452e0feaa433f341b306e308166058e8126e934"
-  integrity sha512-SHwrzk9HuAUwl3/qfupU3ZnW4ZgVOpI2+3gwGmvoPOmAlKFlo7liSCszA5hcRpsnhjS66BqUzfx6BWOwzYvmKQ==
+"@formatjs/intl-relativetimeformat@^7.2.7":
+  version "7.2.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.7.tgz#dce72ebafb1ca0bf14673fab3b1aad145e1abac6"
+  integrity sha512-R6rxX4PfPQ/EuDRALLSIEDCDW/FAmmu6xpRXIPdZ33bEP7SXEksJB039Bw//I0VIm2fBeIlxe9oqvRGfuqpwVg==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.1"
+    "@formatjs/ecma402-abstract" "^1.2.2"
 
 "@formatjs/intl-unified-numberformat@^3.2.0":
   version "3.3.2"