diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index eae4f62f267561472652d83d2bc22d1664e44046..d7284c41a7f57ee81bdedc2015a0fdbf1ce87db7 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -120,7 +120,7 @@ void LLAvatarNameCache::processNameFromService(const LLSD& row)
 		std::string last_name = row["last_name"].asString();
 		av_name.mDisplayName =
 			LLCacheName::buildFullName(first_name, last_name);
-		av_name.mIsLegacy = true;
+		av_name.mIsLegacy = (last_name != "Resident");
 	}
 
 	// add to cache