error and login changes