More OpenID fixes

Oops, Google was hardcoded into the utility.  This doesn't affect anything at the moment, since we only support Google.