Fix user selection