changes enqueue
passes useremail through some more places
Merge master and fix conflict