diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index cde08c7b1931140a94acda89dc305fb012d58f08..3792f18c9755e14f86d9d9e256b96db7ae231b70 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2723,7 +2723,10 @@ LLOnHoverChangeableTextSegment::LLOnHoverChangeableTextSegment( LLStyleConstSP s
 F32 LLOnHoverChangeableTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
 {
 	F32 result = LLNormalTextSegment::draw(start, end, selection_start, selection_end, draw_rect);
-	mStyle = mNormalStyle;
+	if (end == mEnd - mStart)
+	{
+		mStyle = mNormalStyle;
+	}
 	return result;
 }
 
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 17d211fb36e6543818d9d7dc23bf94467f399a56..bf7b25910fe0f918eda5b60f793c02b132093c64 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -366,7 +366,7 @@ std::string LLUrlEntryAgent::getTooltip(const std::string &string) const
 bool LLUrlEntryAgent::underlineOnHoverOnly(const std::string &string) const
 {
 	std::string url = getUrl(string);
-	return LLStringUtil::endsWith(url, "/about");
+	return LLStringUtil::endsWith(url, "/about") || LLStringUtil::endsWith(url, "/inspect");
 }
 
 std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 7c33923f044b424816f1b5814928e792be0efe2e..7204e6c39ccdab117d8d2daad9dd8c9dd951dcaa 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -699,8 +699,9 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 			{
 				LLStyle::Params link_params(style_params);
 				link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
-				// Convert the name to a hotlink and add to message.
-				mEditor->appendText(chat.mFromName + delimiter, false, link_params);
+				// Add link to avatar's inspector and delimiter to message.
+				mEditor->appendText(link_params.link_href, false, style_params);
+				mEditor->appendText(delimiter, false, style_params);
 			}
 			else
 			{
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index 8fab3bb361fce9f07ea944cb7941b76a9c0d8ae8..b3d7dddde88f9c2cc8d5cbef0a96f7e654172c62 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -46,20 +46,12 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source)
 	if (mMap.find(source) == mMap.end())
 	{
 		LLStyle::Params style_params;
-		if (source != LLUUID::null && source != gAgent.getID() )
+		if (source != LLUUID::null)
 		{
 			style_params.color.control = "HTMLLinkColor";
 			style_params.readonly_color.control = "HTMLLinkColor";
-			style_params.link_href = 
-					LLSLURL("agent", source, "inspect").getSLURLString();
+			style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString();
 		}
-		else
-		{
-			// Make the resident's own name white and don't make the name clickable.
-			style_params.color = LLColor4::white;
-			style_params.readonly_color = LLColor4::white;
-		}
-
 		mMap[source] = style_params;
 	}
 	return mMap[source];