Allow logging by username or email
Merge pull request #1803 from kayue/fix/user-email-canonical

Allow logging by username or email