Fix incorrectly nested user/popit locals

These need to be at the top level rather than nested under config to be
consistent with where they were previously.