Added login, fixed register