Ensure Django uses the label for displaying

This ensures the label is visible in error messages and select boxes, for example.


Note:
I'll divide my changes up in smaller Pull Requests so they can be selectively applied if they conflict with another Pull Request.