Improve Login, username can login now