more fixing on login