Fixes #25 and enables email enrolling