More work on the LoginListener

Probably my last commit. It's not finished.