diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index efea8c9ef0..bc8803637e 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -897,7 +897,9 @@ LLUrlEntryAgentDisplayName::LLUrlEntryAgentDisplayName()
 
 std::string LLUrlEntryAgentDisplayName::getName(const LLAvatarName& avatar_name)
 {
-	return avatar_name.getDisplayName(true);
+	// <FS:Ansariel> Don't force a display name if display names are disabled
+	//return avatar_name.getDisplayName(true);
+	return avatar_name.getDisplayName();
 }
 
 //
diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index c74c2371d7..8d5c27f3c2 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -1334,7 +1334,10 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		{
 			if (chat.mSourceType == CHAT_SOURCE_AGENT)
 			{
-				std::string name_format = "completename";
+				static LLCachedControl<bool> useDisplayNames(gSavedSettings, "UseDisplayNames");
+				static LLCachedControl<bool> nameTagShowUsernames(gSavedSettings, "NameTagShowUsernames");
+
+				std::string name_format = (useDisplayNames && nameTagShowUsernames) ? "completename" : "displayname";
 				if (is_local && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 				{
 					name_format = "rlvanonym";