diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 9c00727d..11b53ef6 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -466,9 +466,15 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$addAction = $instance->i18n_singular_name();
 			
 			// Get description
-			$description = _t($class . 'DESCRIPTION');
-			if(!$description) $description = $instance->uninherited('description');
-			if($class == 'Page' && !$description) $description = singleton('SiteTree')->uninherited('description');
+			$description = _t($class . '.DESCRIPTION');
+
+			if(!$description) {
+				$description = $instance->uninherited('description');
+			}
+			
+			if($class == 'Page' && !$description) {
+				$description = singleton('SiteTree')->uninherited('description');
+			}
 			
 			$result->push(new ArrayData(array(
 				'ClassName' => $class,
@@ -480,6 +486,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		}
 		
 		$result = $result->sort('AddAction');
+		
 		return $result;
 	}
 
diff --git a/code/model/SiteConfig.php b/code/model/SiteConfig.php
index 66da02cf..89ea9a85 100644
--- a/code/model/SiteConfig.php
+++ b/code/model/SiteConfig.php
@@ -205,11 +205,13 @@ class SiteConfig extends DataObject implements PermissionProvider {
 		$siteConfig->Tagline = _t('SiteConfig.TAGLINEDEFAULT',"your tagline here");
 
 		if(class_exists('Translatable') && $siteConfig->hasExtension('Translatable')){
-			$defaultConfig = DataObject::get_one('SiteConfig');
-			if($defaultConfig){
-				$siteConfig->Title = $defaultConfig->Title;
-				$siteConfig->Tagline = $defaultConfig->Tagline;
-			}
+			Translatable::disable_locale_filter();
+			$defaultConfig = SiteConfig::get()->first();
+			Translatable::enable_locale_filter();			
+			
+			if($defaultConfig){					
+				return $defaultConfig->createTranslation($locale);
+			}			
 			
 			// TODO Copy view/edit group settings