userprofile: fix picklist keys and check for duplication on add