Updates for Google Accounts

Fixes for Google Apps users.