More work on oauth login