Added usernames

Check for usernames as well as emails on login