Minor updates to login to handle messages in the right places