diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 950bff3eb0..9a66edf9f3 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1409,23 +1409,6 @@
       <integer>1</integer>
     </map>
 
-<key>FirestormTagColor</key>
-<map>
-    <key>Comment</key>
-    <string>The tag color you wish to have.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>    
-    <string>Color4</string>
-    <key>Value</key>
-    <array>
-    <real>1</real>
-    <real>0</real>
-    <real>0</real>
-    <real>1.0</real>
-</array>
-</map>
-    
     <key>CrashHostUrl</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 0110e71964..df92ae2d22 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -423,6 +423,22 @@
 			<real>1.0</real>
 		</array>
 	</map>
+	<key>FirestormTagColor</key>
+	<map>
+	    <key>Comment</key>
+	    <string>The tag color you wish to have.</string>
+	    <key>Persist</key>
+	    <integer>1</integer>
+	    <key>Type</key>    
+	    <string>Color4</string>
+	    <key>Value</key>
+	    <array>
+	    <real>1</real>
+	    <real>0</real>
+	    <real>0</real>
+	    <real>1.0</real>
+	</array>
+	</map>
     <!-- End of Firestorm settings -->
     </map>
 </llsd>
diff --git a/indra/newview/fspanelprefs.cpp b/indra/newview/fspanelprefs.cpp
index e6a8586bf3..bcb0164eeb 100644
--- a/indra/newview/fspanelprefs.cpp
+++ b/indra/newview/fspanelprefs.cpp
@@ -207,7 +207,7 @@ void PanelPreferenceFirestorm::refreshTagCombos()
 	getChild<LLUICtrl>("FSShowOwnTagColor_toggle")->setValue(gSavedSettings.getBOOL("FSShowOwnTagColor"));
 
 
-	LLColor4 tag_color = gSavedSettings.getColor4("FirestormTagColor");
+	LLColor4 tag_color = gSavedPerAccountSettings.getColor4("FirestormTagColor");
 	LLSD selectedColor;
 	if (tag_color==LLColor4::red) selectedColor = LLSD("red");
 	else if (tag_color==LLColor4::blue) selectedColor = LLSD("blue");
@@ -264,8 +264,8 @@ void PanelPreferenceFirestorm::applyTagCombos()
 	else if (selectedColor == "orange") tag_color = LLColor4((F32)0.99,(F32)0.39,(F32)0.12,(F32)1);
 	else if (selectedColor == "green") tag_color = LLColor4::green;
 
-	if(tag_color!=gSavedSettings.getColor4("FirestormTagColor")){
-		gSavedSettings.setColor4("FirestormTagColor",tag_color);
+	if(tag_color!=gSavedPerAccountSettings.getColor4("FirestormTagColor")){
+		gSavedPerAccountSettings.setColor4("FirestormTagColor",tag_color);
 		if(gAgentAvatarp!=NULL)	gAgentAvatarp->forceBakeAllTextures(true);
 		if(gSavedSettings.getBOOL("FSShowOwnTagColor")) change=true;
 	}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 10d576c6ea..0f9246fa2d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3127,7 +3127,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 			}
 	LLColor4 name_tag_color = getNameTagColor(is_friend);
 
-	if(isSelf() && gSavedSettings.getBOOL("FSShowOwnTagColor")) name_tag_color=gSavedSettings.getColor4("FirestormTagColor");
+	if(isSelf() && gSavedSettings.getBOOL("FSShowOwnTagColor")) name_tag_color=gSavedPerAccountSettings.getColor4("FirestormTagColor");
 
 	// Wolfspirit: If we don't need to display a friend,
 	// if we aren't self, if we use colored Clienttags and if we have a color
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index e3df8ea976..a03863bfcc 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2757,7 +2757,7 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const
 	const char* tag_client = "Firestorm";
 	LLUUID client_name;
 	strncpy((char*)&client_name.mData[0], tag_client, UUID_BYTES);
-	static LLCachedControl<LLColor4> tag_color(gSavedSettings, "FirestormTagColor", LLColor4(1,0,1,1));
+	static LLCachedControl<LLColor4> tag_color(gSavedPerAccountSettings, "FirestormTagColor", LLColor4(1,0,1,1));
 	entry->setColor(tag_color);
 	//This glow is used to tell if the tag color is set or not.
 	entry->setGlow(0.1f);