diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index a26fd010c6..42b516a931 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -2255,7 +2255,16 @@ public function getSettingsFields()
         };
         $viewAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_VIEW_ALL', 'ADMIN']));
         $editAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_EDIT_ALL', 'ADMIN']));
-        $membersMap = Member::get()->map('ID', 'Name');
+
+        // $membersMap is limited to 100 records specifically so that it does not crash the front-end
+        // if the website has a large number of Members, which is likely to happen if the website also
+        // uses the Member table for non-cms public users
+        // This limit should be removed if the ListboxField front-end component is switched out or
+        // modified so that it does not load all users at once and instead uses XHR to fetch a subset
+        // of users based on what the user types in
+        $membersMap = Member::get()
+            ->limit(100)
+            ->map('ID', 'Name');
 
         $fields = new FieldList(
             $rootTab = new TabSet(
diff --git a/lang/fr.yml b/lang/fr.yml
index 2ea79b3810..f1c82396d7 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -267,6 +267,7 @@ fr:
     db_Sort: Tri
     db_Title: Titre
     db_URLSegment: 'Segment d''URL'
+    db_Version: Version
     has_one_Parent: 'Page parente'
     many_many_BackLinkTracking: 'Suivi des liens retour'
     many_many_ImageTracking: 'Suivi des images'
diff --git a/lang/nl.yml b/lang/nl.yml
index e48df45607..d6a232c366 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -289,6 +289,9 @@ nl:
       one: '1 pagina link'
       other: '{count} pagina links'
     SINGULARNAME: 'Pagina link'
+    has_one_Parent: Bovenliggende
+  SilverStripe\CMS\Model\SiteTreeLinkTracking:
+    many_many_LinkTracking: 'Links volgen'
   SilverStripe\CMS\Model\VirtualPage:
     CHOOSE: 'Gekoppelde pagina'
     DESCRIPTION: 'Toont de inhoud van een andere pagina'