Fix for Google domains users, from twang817