Fixed login and addUser