Use checkbox label instead of value

Lets try this again except handling the 0 case as well.

We can't just change the display of checkboxes for existing users, this would have to be added as a configuration option. The patch should also be converted to a merge request.