3 files changed, 3 insertions, 19 deletions
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 6a43193b2..2fdb29679 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -39,12 +39,6 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		if (!strchr(parameters[0],'@'))
-		{
-			user->WriteServ("NOTICE %s :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-			return CMD_FAILURE;
-		}
-
 		long duration = ServerInstance->Duration(parameters[1]);
 
 		ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 929bccf9f..37a15c210 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -39,14 +39,9 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		if (!strchr(parameters[0],'@'))
-		{       
-			user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-			return CMD_FAILURE;
-		}
 		else if (strchr(parameters[0],'!'))
 		{
-			user->WriteServ("NOTICE %s :*** G-Line cannot contain a nickname!",user->nick);
+			user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick);
 			return CMD_FAILURE;
 		}
 
diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 5efd6e2e4..50f9ebf08 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -39,14 +39,9 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		if (!strchr(parameters[0],'@'))
-		{       
-			user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-			return CMD_FAILURE;
-		}
-		else if (strchr(parameters[0],'!'))
+		if (strchr(parameters[0],'!'))
 		{
-			user->WriteServ("NOTICE %s :*** K-Line cannot contain a nickname!",user->nick);
+			user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick);
 			return CMD_FAILURE;
 		}