Gmailopenid

Couple of commits to fix #1914