Add email fields to user serializer and deserializer
Chris Knapp and Phil Baumann