Added support for login with username