Added ability to login with username