fixed some problems with the login/retention of user data