Making user token optional