Addendum to supporting email logins

Logins check to see if the login has a @ symbol. This commit ensures
that if the email retrieved is null. It'll go ahead and try to login
with the original login value.