Added login with username as well