diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b8391fe91..8eea88f97 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -605,7 +605,7 @@
 		<key>Type</key>
 		<string>Boolean</string>
 		<key>Value</key>
-		<integer>0</integer>
+		<integer>1</integer>
 	</map>
 	<key>WoLfVerticalIMTabs</key>
 	<map>
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index ccaffc1df..1ef08ac25 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -83,6 +83,7 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
 	childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
 	childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
+	childSetCommitCallback("show_friend_tag_check", onCommitCheckBox, this);
 
 	childSetCommitCallback("custom_tag_color_swatch", onCommitColor, this);
 	childSetCommitCallback("effect_color_swatch", onCommitColor, this);
@@ -137,12 +138,26 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 	{
 		self->refresh();
 	}
+
+	if (ctrl->getName() == "show_friend_tag_check")
+	{
+		for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+		iter != LLCharacter::sInstances.end(); ++iter)
+		{
+			LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+			if(avatarp)
+			{
+				LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+				avatarp->mClientTag = "";
+			}
+		}
+	}
+
 	BOOL showCustomOptions;
 	if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
 		showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
 	else
 		showCustomOptions = gSavedPerAccountSettings.getBOOL("AscentUseCustomTag");
-
 	self->childSetValue("customize_own_tag_check", showCustomOptions);
 	self->childSetEnabled("custom_tag_label_text", showCustomOptions);
 	self->childSetEnabled("custom_tag_label_box", showCustomOptions);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 4fde5180d..2c833a747 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2575,6 +2575,8 @@ bool idle_startup()
 		// object is created.  I think this must be done after setting the region.  JC
 		gAgent.setPositionAgent(agent_start_position_region);
 
+		wlfPanel_AdvSettings::fixPanel();
+
 		display_startup();
 		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
 		return FALSE;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 719b45420..661a3fbee 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3244,9 +3244,9 @@ void LLVOAvatar::idleUpdateWindEffect()
 }
 
 bool LLVOAvatar::updateClientTags()
-{/* Won't do anything for now, we don't have a definitions site set up. -HGB
-	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml");
-	LLSD response = LLHTTPClient::blockingGet("http://www.destructivelabs.net/remote/tags/client_list.xml");
+{ 
+	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml");
+	LLSD response = LLHTTPClient::blockingGet("http://ascent.balseraph.org/updates/client_definitions.xml");
 	if(response.has("body"))
 	{
 		const LLSD &client_list = response["body"];
@@ -3259,7 +3259,7 @@ bool LLVOAvatar::updateClientTags()
 			export_file.close();
 			return true;
 		}
-	}*/
+	}
 	return false;
 }
 
@@ -3384,7 +3384,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
 			&& getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6")
 			{
 				color = gColors.getColor( "AvatarNameColor" );
-				//client = "??";
+				client = "?";
 			}
 			return;
 		}
@@ -3419,6 +3419,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
 	{
 		color = gColors.getColor( "AvatarNameColor" );
 		color.setAlpha(1.f);
+		client = "?";
 		//llinfos << "Apparently this tag isn't registered: " << uuid_str << llendl;
 	}
 
@@ -3704,7 +3705,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				
 				if (client.length() || is_away || is_muted || is_busy)
 				{
-					if (client != "")
+					if ((client != "")&&(client != "?"))
 					{
 						if ((!mIsSelf)||(gSavedSettings.getBOOL("AscentShowSelfTag")))
 						{