fix user_selector in 2.0