FID-1260: Make OpenID authentication friendlier when using Yahoo. Also, fix fatal bug introduced in last commit.