diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index ed6768365..9caa43f64 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -53,10 +53,6 @@ void LLNameBox::displayAsLink(bool link)
 	static const LLUICachedControl<LLColor4> color("HTMLAgentColor");
 	setColor(link ? color : LLUI::sColorsGroup->getColor("LabelTextColor"));
 	setDisabledColor(link ? color : LLUI::sColorsGroup->getColor("LabelDisabledColor"));
-	if (link)
-		mFontStyle |= LLFontGL::UNDERLINE;
-	else
-		mFontStyle &= ~LLFontGL::UNDERLINE;
 }
 
 void LLNameBox::showProfile()
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index 6062684d7..d00a6dc25 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -80,10 +80,6 @@ void LLNameEditor::displayAsLink(bool link)
 {
 	static const LLUICachedControl<LLColor4> color("HTMLAgentColor");
 	setReadOnlyFgColor(link ? color : LLUI::sColorsGroup->getColor("TextFgReadOnlyColor"));
-	if (link)
-		mFontStyle |= LLFontGL::UNDERLINE;
-	else
-		mFontStyle &= ~LLFontGL::UNDERLINE;
 }
 
 void LLNameEditor::setText(const std::string& text)