diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0d1bf6ac2f..5da9152989 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -177,7 +177,7 @@
     <key>Value</key>
     <integer>2</integer>
   </map>
-  <key>FSClientTagsVisibility</key>
+  <key>FSClientTagsVisibility2</key>
   <map>
     <key>Comment</key>
     <string>Show clienttags: 0=Clienttags Off, 1=That are on the TPVD (needs FSUseLegacyClienttags), 2=That are on the client_tag.xml (needs FSUseLegacyClienttags), 3=That using the new system</string>
@@ -186,7 +186,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>FSUseV1TagColor</key>
   <map>
diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 727f63ee0d..5c93ae8a4f 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -332,7 +332,7 @@ LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color){
 	curtag["id_based"]=new_system;	
 	curtag["tex_color"]=color.getValue();	
 	// If we don't want to display anything...return
-	if(gSavedSettings.getU32("FSClientTagsVisibility") == 0)
+	if(gSavedSettings.getU32("FSClientTagsVisibility2") == 0)
 	{
 		return curtag;
 	}
@@ -434,7 +434,7 @@ LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color){
 	//WS: If we have a tag using the new system, check if we want to display it's name and/or color
 	if(new_system)
 	{
-		if(gSavedSettings.getU32("FSClientTagsVisibility") >= 3)
+		if(gSavedSettings.getU32("FSClientTagsVisibility2") >= 3)
 		{
 			// strnlen() doesn't exist on OS X before 10.7. -- TS
 			char tag_temp[UUID_BYTES+1];
@@ -466,7 +466,7 @@ LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color){
 
 	//If we only want to display tpvd viewer. And "tpvd" is not available or false, then
 	// clear the data, but keep the basedata (like uuid, id_based and tex_color) for (maybe) later displaying.
-	if(gSavedSettings.getU32("FSClientTagsVisibility") <= 1 && (!curtag.has("tpvd") || !curtag["tpvd"].asBoolean()))
+	if(gSavedSettings.getU32("FSClientTagsVisibility2") <= 1 && (!curtag.has("tpvd") || !curtag["tpvd"].asBoolean()))
 	{
 		curtag.clear();
 	}
diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp
index d2ed9557de..1c96f12dc3 100644
--- a/indra/newview/fspanelprefs.cpp
+++ b/indra/newview/fspanelprefs.cpp
@@ -171,7 +171,7 @@ void PanelPreferenceFirestorm::refreshTagCombos()
 
 	//WS: Set the combo_boxes to the right value
 	U32 usel_u = gSavedSettings.getU32("FSUseLegacyClienttags");
-	U32 tagv_u = gSavedSettings.getU32("FSClientTagsVisibility");
+	U32 tagv_u = gSavedSettings.getU32("FSClientTagsVisibility2");
 	U32 tagc_u = gSavedSettings.getU32("FSColorClienttags");
 
 
@@ -208,11 +208,11 @@ void PanelPreferenceFirestorm::applyTagCombos()
 	bool change=false;
 	if(gSavedSettings.getU32("FSUseLegacyClienttags")!=m_UseLegacyClienttags->getCurrentIndex()
 		|| gSavedSettings.getU32("FSColorClienttags")!=m_ColorClienttags->getCurrentIndex()
-		|| gSavedSettings.getU32("FSClientTagsVisibility")!=m_ClientTagsVisibility->getCurrentIndex()){
+		|| gSavedSettings.getU32("FSClientTagsVisibility2")!=m_ClientTagsVisibility->getCurrentIndex()){
 
 		gSavedSettings.setU32("FSUseLegacyClienttags",m_UseLegacyClienttags->getCurrentIndex());
 		gSavedSettings.setU32("FSColorClienttags",m_ColorClienttags->getCurrentIndex());
-		gSavedSettings.setU32("FSClientTagsVisibility",m_ClientTagsVisibility->getCurrentIndex());
+		gSavedSettings.setU32("FSClientTagsVisibility2",m_ClientTagsVisibility->getCurrentIndex());
 		
 		//WS: Clear all nametags to make everything display properly!
 		change=true;
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index ded9d629f4..b5bbc1a0e3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -1427,6 +1427,18 @@
      label="Tags"
      name="TagTab">
 
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="15"
+       layout="topleft"
+       left="5"
+       name="whattagstoshow"
+       top_pad="10"
+       width="512">
+        Note: Do to changes Linden Lab has made, viewer tags will not work in Second Life.
+      </text>
         <text
          type="string"
          length="1"