More work on login.