diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index f3ac676edd6baf8e0c2f70cc8fe2779a1ad7a9ac..0e9da25c583c0265631e880696c3e6f161d6e3c9 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -74,6 +74,11 @@ class LLGroupList: public LLFlatListView, public LLOldEvents::LLSimpleListener
 	void setNameFilter(const std::string& filter);
 	void toggleIcons();
 	bool getIconsVisible() const { return mShowIcons; }
+
+	// *WORKAROUND: two methods to overload appropriate Params due to localization issue:
+	// no_groups_msg & no_filtered_groups_msg attributes are not defined as translatable in VLT. See EXT-5931
+	void setNoGroupsMsg(const std::string& msg) { mNoGroupsMsg = msg; }
+	void setNoFilteredGroupsMsg(const std::string& msg) { mNoFilteredGroupsMsg = msg; }
 	
 private:
 	void setDirty(bool val = true)		{ mDirty = val; }
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 93a6a7803a47b5a7443e68902e543c3fa21512c5..eba5d0cb143a5b136fd533cc63253ff81bb3fa89 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -519,6 +519,8 @@ BOOL LLPanelPeople::postBuild()
 	mRecentList->setShowIcons("RecentListShowIcons");
 
 	mGroupList = getChild<LLGroupList>("group_list");
+	mGroupList->setNoGroupsMsg(getString("no_groups_msg"));
+	mGroupList->setNoFilteredGroupsMsg(getString("no_filtered_groups_msg"));
 
 	mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
 	mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 540e17e41354c68d3cff567eb99c8df4fddb2b5f..375f5b6593094b008dc64f733155c9e1ccaf541e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -28,6 +28,16 @@
     <string
      name="groups_filter_label"
      value="Filter Groups" />
+     <!--
+     *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
+     They are not defined as translatable in VLT. See EXT-5931
+     -->
+    <string
+     name="no_filtered_groups_msg"
+     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+    <string
+     name="no_groups_msg"
+     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
@@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          name="groups_panel"
          top="0"
          width="313">
+    <!--
+     *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
+     Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
+    -->
             <group_list
              follows="all"
              height="345"
              layout="topleft"
              left="0"
              name="group_list"
-             no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
              no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />