diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
index 218346d3..5f4b6fc2 100644
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@@ -8,7 +8,6 @@
     "serverConnectionsLabel": "Connexion",
     "manageKnownServersShort": "Serveurs",
     "manageKnownServersLong": "Gérer les serveurs connus",
-    "displayNameTooltip": "Veuillez entrer un nom d'usage s'il vous plaît",
     "manageKnownServersButton": "Gérer les serveurs connus",
     "importLocalServerSelectText": "Sélectionnez le serveur local",
     "importLocalServerLabel": "Importer un serveur hébergé localement",
@@ -267,4 +266,4 @@
     "newBulletinLabel": "Nouveau bulletin",
     "createGroupBtn": "Créer",
     "createGroupTitle": "Créer un groupe"
-}
\ No newline at end of file
+}
diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index a05ef4df..e6e13c19 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -114,7 +114,7 @@ class _ContactsViewState extends State<ContactsView> {
         }));
 
     // Manage known Servers
-    if (Provider.of<Settings>(context, listen: false).isExperimentEnabled(ServerManagementExperiment)) {
+    if (Provider.of<Settings>(context, listen: false).isExperimentEnabled(TapirGroupsExperiment) || Provider.of<Settings>(context, listen: false).isExperimentEnabled(ServerManagementExperiment)) {
       actions.add(IconButton(
           icon: Icon(CwtchIcons.dns_24px),
           tooltip:  AppLocalizations.of(context)!.manageKnownServersButton,