added some fields, using email now instead of username