[Pending #214] Email confirmation db cleanup

Merge after #214