diff --git a/code/FaviconImage.php b/code/FaviconImage.php
index 697e707..a971c81 100644
--- a/code/FaviconImage.php
+++ b/code/FaviconImage.php
@@ -7,7 +7,7 @@ class FaviconImage extends Image{
 	}
 	
 	public function CMSThumbnail() {
-		return $this;
+		return $this->getFormattedImage('CMSThumbnail');
 	}
 }
 
diff --git a/code/Subsite.php b/code/Subsite.php
index afd9e8a..991935b 100644
--- a/code/Subsite.php
+++ b/code/Subsite.php
@@ -181,7 +181,7 @@ class Subsite extends DataObject implements PermissionProvider {
 					// new TextField('RedirectURL', 'Redirect to URL', $this->RedirectURL),
 					new CheckboxField('DefaultSite', 'Default site', $this->DefaultSite),
 					new CheckboxField('IsPublic', 'Enable public access', $this->IsPublic),
-					new ImageField('Favicon', 'Bookmark Icon')
+					new ImageField('Favicon', 'Bookmark Icon', $this->ID)
 				)
 			),
 			new HiddenField('ID', '', $this->ID),