Feature/fix google auth