Fix tracking for sign in/out