diff --git a/headers/private/locale/MutableLocaleRoster.h b/headers/private/locale/MutableLocaleRoster.h
index 0d5e535d81..23b47126a7 100644
--- a/headers/private/locale/MutableLocaleRoster.h
+++ b/headers/private/locale/MutableLocaleRoster.h
@@ -109,6 +109,7 @@ struct RosterData {
 			BMessage			fPreferredLanguages;
 
 			BLocale				fDefaultLocale;
+			BLanguage			fDefaultLanguage;
 			BTimeZone			fDefaultTimeZone;
 
 								RosterData();
diff --git a/src/kits/locale/LocaleRoster.cpp b/src/kits/locale/LocaleRoster.cpp
index 7da6475e16..dcdb5c5352 100644
--- a/src/kits/locale/LocaleRoster.cpp
+++ b/src/kits/locale/LocaleRoster.cpp
@@ -104,7 +104,7 @@ BLocaleRoster::GetDefaultLanguage(BLanguage* language) const
 	if (!lock.IsLocked())
 		return B_ERROR;
 
-	*language = *gRosterData.fDefaultLocale.Language();
+	*language = gRosterData.fDefaultLanguage;
 
 	return B_OK;
 }
diff --git a/src/kits/locale/MutableLocaleRoster.cpp b/src/kits/locale/MutableLocaleRoster.cpp
index eda3440136..339b7f51dc 100644
--- a/src/kits/locale/MutableLocaleRoster.cpp
+++ b/src/kits/locale/MutableLocaleRoster.cpp
@@ -592,7 +592,7 @@ RosterData::_SetPreferredLanguages(const BMessage* languages)
 			return B_ERROR;
 
 		fDefaultLocale.SetCollator(BCollator(langName.String()));
-		fDefaultLocale.SetLanguage(langName.String());
+		fDefaultLanguage.SetTo(langName.String());
 
 		fPreferredLanguages.RemoveName("language");
 		for (int i = 0; languages->FindString("language", i, &langName) == B_OK;