diff --git a/core/model/SiteConfig.php b/core/model/SiteConfig.php
index ab2931886..c5ed09a09 100644
--- a/core/model/SiteConfig.php
+++ b/core/model/SiteConfig.php
@@ -53,7 +53,7 @@ class SiteConfig extends DataObject implements PermissionProvider {
 		$editorsOptionsSource["OnlyTheseUsers"] = _t('SiteTree.EDITONLYTHESE', "Only these people (choose from list)");
 		$editorsOptionsField->setSource($editorsOptionsSource);
 
-		if (!Permission::check('ADMIN') && !Permission::check('EDIT_SITECONFIG')) {
+		if (!Permission::check('EDIT_SITECONFIG')) {
 			$fields->makeFieldReadonly($viewersOptionsField);
 			$fields->makeFieldReadonly($viewerGroupsField);
 			$fields->makeFieldReadonly($editorsOptionsField);
diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index fa07d6428..f7a42f8cd 100755
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -889,6 +889,14 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		// Normal case
 		return $this->canEdit($member);
 	}
+	
+	/**
+	 * Stub method to get the site config, provided so it's easy to override
+	 */
+	function getSiteConfig() {
+		if ($this->hasMethod('alternateSiteConfig')) return $this->alternateSiteConfig();
+		return SiteConfig::current_site_config();
+	}
 
 
 	/**