Add/fix user/mode options.