generated users, added db migration, added test for user to respond to email
merged conflict