Fix undesirable behaviour for unset user tracking