Add username recognition
Add support for username auth