diff --git a/Changes b/Changes
index 6a64024f1..2b29ce2cd 100644
--- a/Changes
+++ b/Changes
@@ -1473,3 +1473,5 @@ seen. gmtime warning still there
   to 0
 - Fixed the bug where /invite doesn't work (TEST BEFORE COMMIT!) reported by havlaz
   (#0000255)
+- Fixed problem where the parameters of the RAKILL aliasing to TKL were switched, 
+  and a missing return for normal users.
diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c
index 0be5cdc29..35f97dd3c 100644
--- a/src/modules/m_rakill.c
+++ b/src/modules/m_rakill.c
@@ -149,17 +149,17 @@ DLLFUNC int m_rakill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		{
 			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
 			    sptr->name);
-			return 0;
 		}
 		else
 		{
 			sendto_one(sptr, ":%s NOTICE %s :*** RAKILL is depricated and should not be used. Please use /gline -user@host instead", 
 				me.name, sptr->name);
 		}
+		return 0;
 	}
 	
-	tkllayer[3] = parv[1];
-	tkllayer[4] = parv[2];	
+	tkllayer[3] = parv[2];
+	tkllayer[4] = parv[1];	
 	tkllayer[5] = sptr->name;
 	m_tkl(&me, &me, 6, tkllayer);
 	loop.do_bancheck = 1;