diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 60aa957a..2b810d59 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -627,23 +627,25 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	}
 
 	/**
-	 * @param int $id
+	 * @param int|SiteTree $idOrRecord ID of record or record instance
 	 * @param FieldList $fields
 	 * @return CMSForm
 	 */
-	public function getEditForm($id = null, $fields = null) {
-
-		if(!$id) $id = $this->currentPageID();
-		$form = parent::getEditForm($id);
+	public function getEditForm($idOrRecord = null, $fields = null) {
+		if(!$idOrRecord) {
+	 		$idOrRecord = $this->currentPageID();
+		}
+		$form = parent::getEditForm($idOrRecord);
 
 		// TODO Duplicate record fetching (see parent implementation)
-		$record = $this->getRecord($id);
+		$record = $this->getRecord($idOrRecord);
 		if($record && !$record->canView()) return Security::permissionFailure($this);
 
 		if(!$fields) $fields = $form->Fields();
 		$actions = $form->Actions();
 
 		if($record) {
+			$id = $record->ID;
 			$deletedFromStage = $record->getIsDeletedFromStage();
 			$deleteFromLive = !$record->getExistsOnLive();
 
@@ -733,7 +735,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 
 			$this->extend('updateEditForm', $form);
 			return $form;
-		} else if($id) {
+		} else if($idOrRecord) {
 			$form = CMSForm::create( $this, "EditForm", new FieldList(
 				new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldList()
 			)->setHTMLID('Form_EditForm');
@@ -917,6 +919,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	public function setCurrentPageID($id) {
 		$id = (int)$id;
 		$this->pageID = $id;
+		parent::setCurrentPageID($id);
 	}
 
 	/**
@@ -925,7 +928,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	 * @return int
 	 */
 	public function currentPageID() {
-		$id = $this->pageID;
+		$id = $this->pageID ?: parent::currentPageID();
 
 		$this->extend('updateCurrentPageID', $id);
 
diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php
index 3ded8572..082659f1 100644
--- a/tests/model/SiteTreeTest.php
+++ b/tests/model/SiteTreeTest.php
@@ -770,19 +770,19 @@ class SiteTreeTest extends SapphireTest {
 			array('pagetype' => $sitetree->i18n_singular_name())
 		);
 		$sitetree->write();
-		$this->assertEquals($sitetree->URLSegment, 'neue-seite',
+		$this->assertEquals('neue-site-tree', $sitetree->URLSegment,
 			'Sets based on default title on first save'
 		);
 
 		$sitetree->Title = 'Changed';
 		$sitetree->write();
-		$this->assertEquals($sitetree->URLSegment, 'changed',
+		$this->assertEquals('changed', $sitetree->URLSegment,
 			'Auto-updates when set to default title'
 		);
 
 		$sitetree->Title = 'Changed again';
 		$sitetree->write();
-		$this->assertEquals($sitetree->URLSegment, 'changed',
+		$this->assertEquals('changed', $sitetree->URLSegment,
 			'Does not auto-update once title has been changed'
 		);