diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index b396dc49dc..535070631c 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -101,6 +101,8 @@ FSRadar::FSRadar() :
 	// Use the callback from LLAvatarNameCache here or we might update the names too early!
 	LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&FSRadar::updateNames, this));
 	gSavedSettings.getControl("NameTagShowUsernames")->getSignal()->connect(boost::bind(&FSRadar::updateNames, this));
+
+	gSavedSettings.getControl("RadarNameFormat")->getSignal()->connect(boost::bind(&FSRadar::updateNames, this));
 }
 
 FSRadar::~FSRadar()
@@ -832,12 +834,6 @@ void FSRadar::onRadarNameFmtClicked(const LLSD& userdata)
 	{
 		gSavedSettings.setU32("RadarNameFormat", FSRADAR_NAMEFORMAT_USERNAME_DISPLAYNAME);
 	}
-
-	FSRadar* instance = FSRadar::getInstance();
-	if (instance)
-	{
-		instance->updateNames();
-	}
 }
 
 //static