diff --git a/Changes b/Changes
index 683cbd11c..ebe6bafa5 100644
--- a/Changes
+++ b/Changes
@@ -1175,3 +1175,4 @@ v- Fixed some bugreport stuff
   This might fix the double recursion mutex problem we got.
 - More -Wall cleanups
 - Fixed hunt_server_token (use IsToken on acptr->from, not acptr)
+- Unbroken Griever's broken hunt_server_token broken token fix
diff --git a/src/s_user.c b/src/s_user.c
index 048250f01..4815d4346 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -398,11 +398,10 @@ int  hunt_server_token(aClient *cptr, aClient *sptr, char *command, char *token,
 			return HUNTED_ISME;
 		if (match(acptr->name, parv[server]))
 			parv[server] = acptr->name;
-		if (IsToken(acptr->from) {
+		if (IsToken(acptr->from)) {
 			sprintf(buff, ":%s %s ", parv[0], token);
 			strcat(buff, params);
-			sendto_one(acptr, buff, parv[1], parv[2],
-			parv[3], parv[4], parv[5], parv[6], parv[7], parv[8]);
+			sendto_one(acptr, buff, parv[1], parv[2], parv[3], parv[4], parv[5], parv[6], parv[7], parv[8]);
 		}
 		else {
 			sprintf(buff, ":%s %s ", parv[0], command);