diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index 1d1c057b..a83c7b7a 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -46,7 +46,8 @@ public:
 	{
 		if (!m_sPass.empty()
 				&& Nick.GetNick().Equals("NickServ")
-				&& sMessage.find("msg") != CString::npos
+				&& (sMessage.find("msg") != CString::npos
+				 || sMessage.find("authenticate") != CString::npos)
 				&& sMessage.AsUpper().find("IDENTIFY") != CString::npos
 				&& sMessage.find("help") == CString::npos) {
 			PutIRC("PRIVMSG NickServ :IDENTIFY " + m_sPass);