diff --git a/Changes b/Changes
index 5fa0e5850..683cbd11c 100644
--- a/Changes
+++ b/Changes
@@ -1174,3 +1174,4 @@ v- Fixed some bugreport stuff
   UnlockEventSystem(). In EVENT() functions, the system _is_ locked.
   This might fix the double recursion mutex problem we got.
 - More -Wall cleanups
+- Fixed hunt_server_token (use IsToken on acptr->from, not acptr)
diff --git a/src/s_user.c b/src/s_user.c
index 7f15a9bf6..048250f01 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -398,7 +398,7 @@ 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)) {
+		if (IsToken(acptr->from) {
 			sprintf(buff, ":%s %s ", parv[0], token);
 			strcat(buff, params);
 			sendto_one(acptr, buff, parv[1], parv[2],