diff --git a/_config/config.yml b/_config/config.yml
index 21aff02..fe226a2 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -14,6 +14,5 @@ CMSPageSettingsController:
   extensions:
     - ContentReviewCMSExtension
 SiteConfig:
-  content_review_gridfield_threshold: 2000
   extensions:
     - ContentReviewDefaultSettings
\ No newline at end of file
diff --git a/code/extensions/ContentReviewDefaultSettings.php b/code/extensions/ContentReviewDefaultSettings.php
index aba5bde..29b418c 100644
--- a/code/extensions/ContentReviewDefaultSettings.php
+++ b/code/extensions/ContentReviewDefaultSettings.php
@@ -133,7 +133,7 @@ class ContentReviewDefaultSettings extends DataExtension
             $gridfieldconfig = GridFieldConfig_RelationEditor::create();
             $gridfieldconfig->removeComponentsByType(new GridFieldAddNewButton());
             $userField = GridField::create('OwnerUsers', _t("ContentReview.PAGEOWNERUSERS", "Users"),
-                    $this->OwnerUsers()->Sort('FirstName'), $gridfieldconfig)
+                    $this->OwnerUsers(), $gridfieldconfig)
                     ->setDescription(_t('ContentReview.OWNERUSERSDESCRIPTION', 'Page owners that are responsible for reviews'));
         } else {
             $userField = ListboxField::create('OwnerUsers', _t('ContentReview.PAGEOWNERUSERS', 'Users'), $usersMap)
diff --git a/tests/SiteTreeContentReviewTest.php b/tests/SiteTreeContentReviewTest.php
index 9fe993b..b1f07a0 100644
--- a/tests/SiteTreeContentReviewTest.php
+++ b/tests/SiteTreeContentReviewTest.php
@@ -345,7 +345,7 @@ class SiteTreeContentReviewTest extends ContentReviewBaseTest
 
         $fields = $page->getSettingsFields();
 		
-        $this->assertTrue($fields->dataFieldByName('OwnerUsers') instanceof ListboxField);
+        $this->assertInstanceOf('ListboxField', $fields->dataFieldByName('OwnerUsers'));
     }
 	
     public function testSiteSettingsFieldsGridfield()
@@ -362,6 +362,6 @@ class SiteTreeContentReviewTest extends ContentReviewBaseTest
 
         $fields = $page->getSettingsFields();
 
-        $this->assertTrue($fields->dataFieldByName('OwnerUsers') instanceof GridField);
+        $this->assertInstanceOf('GridField', $fields->dataFieldByName('OwnerUsers'));
 	}
 }