diff --git a/code/CMSMain.php b/code/CMSMain.php
index d96b396a..35028f8c 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1321,7 +1321,7 @@ JS;
 			'category' => _t('Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
 			'sort' => -100
 		);
-		
+
 		if (isset($perms['CMS_ACCESS_ModelAdmin'])) unset($perms['CMS_ACCESS_ModelAdmin']);
 		
 		return $perms;
diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index 73e793c6..e4d58360 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -28,7 +28,7 @@ abstract class CMSSiteTreeFilter extends Object {
 		}
 
 		$leftAndMain = new CMSMain();
-		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'));
+		$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, null, null, array($this, 'includeInTree'), count($this->ids));
 
 		// Trim off the outer tag
 		$tree = ereg_replace('^[ \t\r\n]*<ul[^>]*>','', $tree);
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 3a18553a..6400013a 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -57,6 +57,8 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function getEditForm($id) {
 		$record = null;
 		
+		if (($id == 'root' || $id == 0) && $this->hasMethod('getRootForm')) return $this->getRootForm($this, 'EditForm');
+		
 		if($id && $id != 'root') {
 			$record = DataObject::get_by_id($this->stat('tree_class'), $id);
 		}