Added some more stuff, like logging in and out consistancy

dero