diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp
index 308bad48f..efe3612b3 100644
--- a/indra/newview/llpaneldirpeople.cpp
+++ b/indra/newview/llpaneldirpeople.cpp
@@ -33,12 +33,8 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llpaneldirpeople.h"
-#include "llviewerwindow.h"
 #include "llnotificationsutil.h"
 
-// linden library includes
-#include "message.h"
-
 // viewer project includes
 #include "llqueryflags.h"
 
@@ -90,7 +86,10 @@ void LLPanelDirPeople::performQuery()
 	{
 		LLNotificationsUtil::add("SeachFilteredOnShortWordsEmpty");
 		return;
-	};
+	}
+
+	// Allow searching for Account Name from account.name
+	LLStringUtil::replaceChar(query_string, '.', ' ');
 
 	// if we filtered something out, display a popup
 	if ( query_was_filtered )
@@ -98,7 +97,7 @@ void LLPanelDirPeople::performQuery()
 		LLSD args;
 		args["FINALQUERY"] = query_string;
 		LLNotificationsUtil::add("SeachFilteredOnShortWords", args);
-	};
+	}
 
 	setupNewSearch();