diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 37de2d579386f679a1512c85f06dac545ae97dfc..a40751562136f9f984c384668fe162b7f07924eb 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -626,7 +626,7 @@ void LLAvalineListItem::setName(const std::string& name)
 }
 
 /************************************************************************/
-/*             class LLAvatarListSocial                                  */
+/*             class LLAvatarListSocial                                 */
 /************************************************************************/
 
 static LLDefaultChildRegistry::Register<LLAvatarListSocial> s("avatar_list_social");
@@ -638,10 +638,12 @@ LLAvatarListSocial::LLAvatarListSocial(const Params& p) : LLAvatarList(p)
 
 void LLAvatarListSocial::addSocialItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
 {
+	LLAvatarName avatar_name;
+	bool has_avatar_name = id.notNull() && LLAvatarNameCache::get(id, &avatar_name);
+
 	LLAvatarListItem* item = new LLAvatarListItem();
-	// This sets the name as a side effect
-	item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus, false);
-	item->setAvatarName(name);
+	item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus, false); // this sets the name as a side effect
+	item->setAvatarName(has_avatar_name ? avatar_name.mDisplayName : name);
 	item->setOnline(mIgnoreOnlineStatus ? true : is_online);
 	item->showLastInteractionTime(mShowLastInteractionTime);
 
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index c7e10d67db39efbcab3b3ea898c00bbdf4c8e273..183714b43642d02840239b5a06054f78ac7559f8 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1665,14 +1665,16 @@ void LLPanelPeople::openFacebookWeb(LLFloaterWebContent::Params& p)
 
 void LLPanelPeople::showFacebookFriends(const LLSD& friends)
 {
-	std::string text = "Facebook Friends";
+	mFacebookFriends->clear();
+
 	for (LLSD::array_const_iterator i = friends.beginArray(); i != friends.endArray(); ++i)
 	{
-		std::string name = (*i)["name"].asString();
-		std::string id = (*i)["id"].asString();
+		const LLSD& fb_friend = *i;
 
-		text = name + " (" + id + ")";
-		mFacebookFriends->addSocialItem(LLUUID(NULL), text, false);
+		std::string name = fb_friend["name"].asString();
+		LLUUID agent_id = fb_friend.has("agent_id") ? fb_friend["agent_id"].asUUID() : LLUUID(NULL);
+		
+		mFacebookFriends->addSocialItem(agent_id, name, false);
 	}
 }
 
@@ -1692,20 +1694,19 @@ class FacebookLoginResponder : public LLHTTPClient::Responder
 		{
 			llinfos << content << llendl;
 
+			// use the token to pull down graph data
 			bool has_token = content["has_access_token"].asBoolean();
-			
-			//use the token to pull down graph data
-			if(has_token)
+			if (has_token)
 			{
 				mPanelPeople->getFacebookFriends();
 			}
-			//request user to login
+			// request user to login
 			else
 			{
-	LLFloaterWebContent::Params p;
-	p.url("https://www.facebook.com/dialog/oauth?client_id=565771023434202&redirect_uri=" + FBC_SERVICES_URL + "/authenticate/" + gAgentID.asString());
+				LLFloaterWebContent::Params p;
+				p.url("https://www.facebook.com/dialog/oauth?client_id=565771023434202&redirect_uri=" + FBC_SERVICES_URL + "/authenticate/" + gAgentID.asString());
 				mPanelPeople->openFacebookWeb(p);
-}
+			}
 		}
 		else
 		{
@@ -1731,7 +1732,14 @@ class FacebookFriendsResponder : public LLHTTPClient::Responder
 			llinfos << content << llendl;
 
 			// display the friend data
-			mPanelPeople->showFacebookFriends(content["friends"]);
+			if (content.has("friends"))
+			{
+				mPanelPeople->showFacebookFriends(content["friends"]);
+			}
+			else if (content.has("error"))
+			{
+				llinfos << "failed to get facebook friends. reason: " << content["error"] << llendl;
+			}
 		}
 		else
 		{