diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 638db97a0..6e7f95a24 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -1297,9 +1297,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
 	mCacheConnection.disconnect();
 	mCacheConnection = LLAvatarNameCache::get(avatar_id, boost::bind(&LLPanelAvatar::onAvatarNameResponse, this, _1, _2));
 
-	LLNameEditor* key_edit = getChild<LLNameEditor>("avatar_key");
-	if (key_edit)
-		key_edit->setText(mAvatarID.asString());
+	if (auto key_edit = getChildView("avatar_key"))
+		key_edit->setValue(mAvatarID.asString());
 
 	// While we're waiting for data off the network, clear out the  old data.
 	if (mPanelSecondLife)
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 4379ff3e1..eeccea15e 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -736,10 +736,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 		if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE);
 		if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE);
 
-		LLNameEditor* key_edit = getChild<LLNameEditor>("group_key");
-		if(key_edit)
+		if (auto key_edit = getChildView("group_key"))
 		{
-			key_edit->setText(gdatap->getID().asString());
+			key_edit->setValue(gdatap->getID().asString());
 		}
 
 		if (mInsignia)