Fixed email_token bug