current fix for login/logout issue