diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index d0abb8fef5b340f6960535731c5cee54ffe3f315..bd2e49a2af8b421e095b4ca37d94c6cb509e4928 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -97,7 +97,7 @@ LLContextMenu* PeopleContextMenu::createMenu()
 			case 2:	ALAvatarActions::estateBan(id);	break;
 			} });
 		registrar.add("Avatar.TeleportTo", [&](LLUICtrl*, const LLSD&) { ALAvatarActions::teleportTo(id); });
-		registrar.add("Avatar.ReportAbuse", [&](LLUICtrl*, const LLSD&) { LLFloaterReporter::showFromObject(id); });
+		registrar.add("Avatar.ReportAbuse", [&](LLUICtrl*, const LLSD&) { ALAvatarActions::reportAbuse(id); });
 
 		enable_registrar.add("Avatar.EnableItem", boost::bind(&PeopleContextMenu::enableContextMenuItem, this, _2));
 		enable_registrar.add("Avatar.CheckItem",  boost::bind(&PeopleContextMenu::checkContextMenuItem,	this, _2));
@@ -176,8 +176,10 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
 		items.push_back(std::string("map"));
 		items.push_back(std::string("share"));
 		items.push_back(std::string("pay"));
-		items.push_back(std::string("block_unblock"));
 		items.push_back(std::string("separator_utils"));
+		items.push_back(std::string("manage_menu"));
+		items.push_back(std::string("block_unblock"));
+		items.push_back(std::string("report_abuse"));
 		items.push_back(std::string("utils_menu"));
 		items.push_back(std::string("copy_username"));
 		items.push_back(std::string("copy_display_name"));
@@ -393,7 +395,10 @@ void NearbyPeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
 			items.push_back(std::string("request_teleport"));
 			items.push_back(std::string("separator_invite_to_group"));
 			items.push_back(std::string("zoom_in"));
+			items.push_back(std::string("separator_utils"));
+			items.push_back(std::string("manage_menu"));
 			items.push_back(std::string("block_unblock"));
+			items.push_back(std::string("report_abuse"));
 		}
 	}
 	else if (flags & ITEM_IN_MULTI_SELECTION)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 24bc6ba580ac041288d6634621e5b5b6d5082a39..5b4f24b550456d4c7b0491d4aaf80d41c41b7ee3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3372,7 +3372,8 @@ class LLAvatarReportAbuse : public view_listener_t
 		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
 		if(avatar)
 		{
-			LLFloaterReporter::showFromObject(avatar->getID());
+
+			ALAvatarActions::reportAbuse(avatar->getID());
 		}
 		return true;
 	}
@@ -6303,12 +6304,7 @@ class LLAvatarResetSkeleton: public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
     {
-		LLVOAvatar* avatar = NULL;
-        LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-        if (obj)
-        {
-            avatar = obj->getAvatar();
-        }
+		LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
 		if(avatar)
         {
             avatar->resetSkeleton(false);