more work on 'login'