fixed user and login