Login using either username or email
Merge branch 'reviews-for-blogs'