Nicer login/out behaviour