diff --git a/code/CMSMain.php b/code/CMSMain.php
index d288f7ef..55add3e5 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -491,11 +491,11 @@ JS;
 	 */
 	function RootForm() {
 		$siteConfig = SiteConfig::current_site_config();
-		$fields = $siteConfig->getFormFields(); 
+		$fields = $siteConfig->getCMSFields(); 
 		if(Object::has_extension('SiteConfig',"Translatable")){ 
 			$fields->push(new HiddenField('Locale','', $siteConfig->Locale ));       
 		} 
-		$form = new Form($this, "EditForm", $fields, $siteConfig->getFormActions());
+		$form = new Form($this, "EditForm", $fields, $siteConfig->getCMSActions());
 		$form->loadDataFrom($siteConfig);
 		
 		$this->extend('updateEditForm', $form);