fixed scanning in login / logout scenarios