diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 52b14760de..2e5a17ccd7 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -43,6 +43,7 @@
 #include "llgrouplist.h"
 #include "llnotificationsutil.h"
 #include "llscrolllistctrl.h"
+#include "llslurl.h"
 #include "llstartup.h"
 #include "lltabcontainer.h"
 #include "llviewermenu.h"
@@ -870,12 +871,7 @@ void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke comm
 		// for single friend, show their name
 		if (ids.size() == 1)
 		{
-			LLUUID agent_id = ids.begin()->first;
-			std::string name;
-			if (gCacheName->getFullName(agent_id, name))
-			{
-				args["NAME"] = name;
-			}
+			args["NAME"] = LLSLURL("agent", ids.begin()->first, "completename").getSLURLString();
 			if (command == GRANT)
 			{
 				LLNotificationsUtil::add("GrantModifyRights", 
diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp
index 3b5e2c0ad7..93097800e2 100644
--- a/indra/newview/fspanelprofile.cpp
+++ b/indra/newview/fspanelprofile.cpp
@@ -1929,10 +1929,9 @@ void FSPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
 }
 
 void FSPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights)
-// AO: If this is modified, also modify LLPanelAvatar::ConfirmModifyRights
 {
 	LLSD args;
-	args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
 
 	if (grant)
 	{
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 05a413f1a9..6fa92ed7b6 100755
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -1122,7 +1122,9 @@ void LLAvatarListItem::confirmModifyRights(bool grant, S32 rights)
 // Same as llpanelavatar::confirmModifyRights
 {
 	LLSD args;
-	args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	// <FS:Ansariel> Always show complete name in rights confirmation dialogs
+	//args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
 	
 	if (grant)
 	{
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 9e30a26042..be2776fd30 100755
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -706,7 +706,9 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
 				if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^  new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
 				{
 					LLSD args;
-					args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+					// <FS:Ansariel> Always show complete name in rights dialogs
+					//args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+					args["NAME"] = LLSLURL("agent", agent_id, "completename").getSLURLString();
 					
 					LLSD payload;
 					payload["from_id"] = agent_id;
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index f43e9e07a8..2bfd1b90ce 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1227,7 +1227,9 @@ void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, c
 		for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i)
 		{
 			LLSD args;
-			args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
+			// <FS:Ansariel> Always show complete name in rights confirmation dialogs
+			//args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
+			args["AVATAR_NAME"] = LLSLURL("agent", *i, "completename").getSLURLString();
 			args["GROUP_NAME"] = group_data->mName;
 			
 			LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args));
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ce3c3cbebb..1a38747628 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -8518,10 +8518,13 @@ void send_lures(const LLSD& notification, const LLSD& response)
 
 		// Record the offer.
 		{
-			std::string target_name;
-			gCacheName->getFullName(target_id, target_name);  // for im log filenames
+			// <FS:Ansariel> Show complete name for TP lures
+			//std::string target_name;
+			//gCacheName->getFullName(target_id, target_name);  // for im log filenames
 			LLSD args;
-			args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
+			//args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
+			args["TO_NAME"] = LLSLURL("agent", target_id, "completename").getSLURLString();
+			// </FS:Ansariel>
 	
 			LLSD payload;