diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 30b2afa499..165df745ea 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -819,16 +819,8 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 	// If desired, also send it to nearby chat, this allows friends'
 	// online/offline times to be referenced in chat & logged.
 	// [FIRE-3522 : SJ] Only show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Toasts
-	if (gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) 
-	{
-		LLChat chat;
-		chat.mText = notify_msg;
-		chat.mSourceType = CHAT_SOURCE_SYSTEM;
-		args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
-		LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
-	}
-	// [FIRE-3522 : SJ] show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
-	if (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)) 
+	//                  or for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
+	if ((gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) || (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
 	{
 		LLChat chat;
 		chat.mText = notify_msg;