Updated to work out of the box from google auth