more work on login