diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index ce4c935234..524aaead14 100755
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -55,7 +55,11 @@ LLUrlRegistry::LLUrlRegistry()
 	registerUrl(new LLUrlEntrySLURL());
 
 	// decorated links for host names like: secondlife.com and lindenlab.com
-	registerUrl(new LLUrlEntrySeconlifeURL());
+	// <FS:Ansariel> Normalize only trusted URL
+	//registerUrl(new LLUrlEntrySeconlifeURL());
+	mUrlEntryTrustedUrl = new LLUrlEntrySeconlifeURL();
+	registerUrl(mUrlEntryTrustedUrl);
+	// </FS:Ansariel>
 
 	registerUrl(new LLUrlEntryHTTP());
 	mUrlEntryHTTPLabel = new LLUrlEntryHTTPLabel();
@@ -266,7 +270,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 		std::string url = text.substr(match_start, match_end - match_start + 1);
 
 		// <FS:Ansariel> Fix the "nolink>" fail; Fix from Alchemy viewer, courtesy of Drake Arconis
-		if (match_entry != mUrlEntryNoLink)
+		if (match_entry != mUrlEntryNoLink && match_entry == mUrlEntryTrustedUrl)
 		{
 		// </FS:Ansariel>
 		LLUriParser up(url);
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index fa6353614f..e075e6fae6 100755
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -98,6 +98,8 @@ private:
 	LLUrlEntryBase* mUrlEntrySLLabel;
 	// <FS:Ansariel> Fix the "nolink>" fail; Fix from Alchemy viewer, courtesy of Drake Arconis
 	LLUrlEntryBase* mUrlEntryNoLink;
+	// <FS:Ansariel> Normalize only trusted URL
+	LLUrlEntryBase* mUrlEntryTrustedUrl;
 };
 
 #endif