Remove the random token and implement a challenge system