Checking for token now supports different users