diff --git a/classes/lnApp/Site.php b/classes/lnApp/Site.php
index 4e5a246..88520bd 100644
--- a/classes/lnApp/Site.php
+++ b/classes/lnApp/Site.php
@@ -35,8 +35,8 @@ abstract class lnApp_Site {
 	/**
 	 * Return the site configured language
 	 */
-	public static function ID() {
-		return Kohana::$config->load('config')->id;
+	public static function ID($format=FALSE) {
+		return $format ? sprintf('%02s',Kohana::$config->load('config')->id) : Kohana::$config->load('config')->id;
 	}
 
 	/**
diff --git a/classes/lnApp/StaticList/YesNo.php b/classes/lnApp/StaticList/YesNo.php
index a9a8d44..fc09dd5 100644
--- a/classes/lnApp/StaticList/YesNo.php
+++ b/classes/lnApp/StaticList/YesNo.php
@@ -23,7 +23,7 @@ abstract class lnApp_StaticList_YesNo extends StaticList {
 
 		return $format ? View::factory(Site::Theme().'/label/bool')
 			->set('label',$value ? 'label-success' : '')
-			->set('column',self::factory()->_get($value)) : $value;
+			->set('column',StaticList_YesNo::factory()->_get($value)) : $value;
 	}
 }
 ?>