diff --git a/push.cpp b/push.cpp
index d71e32e..582fb2e 100644
--- a/push.cpp
+++ b/push.cpp
@@ -640,6 +640,7 @@ class CPushMod : public CModule
 
 			VCString values;
 			options["highlight"].Split(" ", values, false);
+			values.push_back("%nick%");
 
 			for (VCString::iterator i = values.begin(); i != values.end(); i++)
 			{
@@ -675,13 +676,6 @@ class CPushMod : public CModule
 				}
 			}
 
-			CNick nick = user->GetNick();
-
-			if (message.find(nick.GetNick()) != std::string::npos)
-			{
-				return true;
-			}
-
 			return false;
 		}