some little changes in login / logout