diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 5f1f57f5506c62ca03e1418901aeee369e559fe1..70cc48f12b8fddef99008917a2e341295eee5e3f 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -445,7 +445,14 @@ void LLAvatarActions::teleportRequest(const LLUUID& id)
 {
 	LLSD notification;
 	notification["uuid"] = id;
-	notification["NAME_SLURL"] =  LLSLURL("agent", id, "about").getSLURLString();
+	LLAvatarName av_name;
+	if (!LLAvatarNameCache::get(id, &av_name))
+	{
+		// unlikely ... they just picked this name from somewhere...
+		LLAvatarNameCache::get(id, boost::bind(&LLAvatarActions::teleportRequest, id));
+		return; // reinvoke this when the name resolves
+	}
+	notification["NAME"] = av_name.getCompleteName();
 
 	LLSD payload;
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9ed9a6f409faaf513e572c69aceb8d135ae5a893..fce21b403bc656a09a133c1f51fbd344b7a6254e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4073,7 +4073,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TeleportRequestPrompt"
    type="alertmodal">
-Request a teleport to [NAME_SLURL] with the following message
+Request a teleport to [NAME] with the following message
     <tag>confirm</tag>
     <form name="form">
       <input name="message" type="text">