diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 6365f57412cb72600e305f314b3d7a9af5e6b627..3cb912ee123bd09531efe99af6b9e08e70252448 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -291,6 +291,7 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
 	setText(p.default_text());
 	
 	mParseOnTheFly = TRUE;
+	mParseHTML = p.read_only;
 }
 
 void LLTextEditor::initFromParams( const LLTextEditor::Params& p)
@@ -2135,6 +2136,7 @@ void LLTextEditor::setEnabled(BOOL enabled)
 	bool read_only = !enabled;
 	if (read_only != mReadOnly)
 	{
+		mParseHTML = read_only;
 		//mReadOnly = read_only;
 		LLTextBase::setReadOnly(read_only);
 		updateSegments();
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index e7d8c0c6e4f343ed2e02d656778b7c85ab766d99..88654c8540ee3a29a547793cfcfddeb8e57baa44 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -38,6 +38,6 @@
    right="-4"
    bg_readonly_color="DkGray2"
    text_readonly_color="White"
-   word_wrap="true"
-   parse_urls="true" />
+   commit_on_focus_lost="true"
+   word_wrap="true" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 5b488b308cdf6cbebef0f4542ce15d5e762a0a95..fab76f3cfc6d1fdb1ee910c764fbc25645059a63 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -158,8 +158,7 @@
        bg_readonly_color="DkGray2"
        text_readonly_color="White"
        commit_on_focus_lost="true"
-       word_wrap="true"
-       parse_urls="true" />
+       word_wrap="true" />
       <text
        font="SansSerifSmall"
        text_color="White_50"