OAuth email username

Fix for issue #5813