Updated token to return user id as well
Starting to plum AD through the system.