diff --git a/code/CMSMain.php b/code/CMSMain.php
index 3b6ffa4b..f37597a2 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -1331,15 +1331,13 @@ JS;
      */
     function LangSelector() {
 		$member = Member::currentUser(); 
-		$locales = singleton('SiteTree')->getAllowedLocalesForMember(Member::currentUser());
-		$localesMap = array();
-		if($locales) foreach($locales as $locale) {
-			$localesMap[$locale] = i18n::get_locale_name($locale);
-		}
-		$dropdown = new DropdownField(
+		$dropdown = new LanguageDropdownField(
 			'LangSelector', 
 			'Language', 
-			$localesMap
+			array(),
+			'SiteTree', 
+			'Locale-English',
+			singleton('SiteTree')
 		);
 		$dropdown->setValue(Translatable::get_current_locale());
 		return $dropdown;