reworked the login