Add user's email to default email choice list [MJ-871]

We don't use the default values anywhere, so I took them out.

The choice list now always has the user's email in it regardless of if they are active.

All tests pass.