Handle underscores in the Google+ vanity name (see #7241)