Fix for enabling/disabling User Chooser